From d008551a839dd64e80420393523a4738e5ca68b1 Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Tue, 8 Apr 2014 12:41:40 +0200 Subject: [PATCH] Fall back to latexdiff --flatten if latexpand is not found --- git-latexdiff | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/git-latexdiff b/git-latexdiff index 286320b..eebad2f 100755 --- a/git-latexdiff +++ b/git-latexdiff @@ -331,6 +331,15 @@ case "$view" in ;; esac +if test $flatten = 1 && + ! command -v latexpand 2>/dev/null; then + echo "Warning: latexpand not found. Falling back to latexdiff --flatten." + latexdiff_flatten=1 + flatten=0 +fi + +## end option parsing ## + check_knitr () { if test -z "$prepare_cmd"; then prepare_cmd="Rscript -e \"library(knitr); knit('$main')\"" @@ -438,8 +447,6 @@ mainbase=$(basename "$main" .tex) maindir=$(dirname "$main") # Option to use latexdiff --flatten instead of latexpand -# Todo: Ideally dependend on whether latexpand is present or not -# Todo: Include warning if --bbl or other latexpand commands are used. if test "$latexdiff_flatten" = 1; then latexdiffopt+=("--flatten") fi