Browse Source

Fix indentation and doc after previous commits

master
Matthieu Moy 12 years ago
parent
commit
d90fb7be9d
  1. 26
      git-latexdiff

26
git-latexdiff

@ -13,8 +13,9 @@
# revisions of a LaTeX file. # revisions of a LaTeX file.
# #
# The script internally checks out the full tree for the specified # The script internally checks out the full tree for the specified
# revisions, and calls latexdiff with the --flatten option, hence this
# works if the document is split into multiple .tex files.
# revisions, calls latexpand to flatten the document and then calls
# latexdiff, hence this works if the document is split into multiple
# .tex files.
# #
# Try "git latexdiff -h" for more information. # Try "git latexdiff -h" for more information.
# #
@ -240,7 +241,7 @@ while test $# -ne 0; do
;; ;;
"--latexdiff-flatten") "--latexdiff-flatten")
latexdiff_flatten=1 latexdiff_flatten=1
flatten=0
flatten=0
;; ;;
"--latexopt") "--latexopt")
shift shift
@ -444,11 +445,11 @@ fi
# Shortcut to include bbl # Shortcut to include bbl
if test "$bbl" = 1; then if test "$bbl" = 1; then
oldbbl=("--expand-bbl old/"$mainbase".bbl")
newbbl=("--expand-bbl new/"$mainbase".bbl")
oldbbl=("--expand-bbl old/"$mainbase".bbl")
newbbl=("--expand-bbl new/"$mainbase".bbl")
else else
oldbbl=("")
newbbl=("")
oldbbl=("")
newbbl=("")
fi fi
# Create flattened documents and keep for debugging # Create flattened documents and keep for debugging
@ -457,17 +458,22 @@ if test "$flatten" = 1; then
latexpand old/"$main" > old/"$mainbase"-fl.tex "${latexpand[@]}" $oldbbl latexpand old/"$main" > old/"$mainbase"-fl.tex "${latexpand[@]}" $oldbbl
latexpand new/"$main" > new/"$mainbase"-fl.tex "${latexpand[@]}" $newbbl latexpand new/"$main" > new/"$mainbase"-fl.tex "${latexpand[@]}" $newbbl
verbose_done verbose_done
verbose "Running latexdiff ${latexdiffopt[@]} old/"$mainbase"-fl.tex new/"$mainbase"-fl.tex > ./diff.tex" verbose "Running latexdiff ${latexdiffopt[@]} old/"$mainbase"-fl.tex new/"$mainbase"-fl.tex > ./diff.tex"
latexdiff "${latexdiffopt[@]}" old/"$mainbase"-fl.tex new/"$mainbase"-fl.tex > diff.tex || die "latexdiff failed"
latexdiff "${latexdiffopt[@]}" old/"$mainbase"-fl.tex new/"$mainbase"-fl.tex > diff.tex \
|| die "latexdiff failed"
verbose_done verbose_done
verbose "mv ./diff.tex new/$mainbase-fl.tex" verbose "mv ./diff.tex new/$mainbase-fl.tex"
mv -f new/"$mainbase"-fl.tex new/"$mainbase"-fl.tex.orig mv -f new/"$mainbase"-fl.tex new/"$mainbase"-fl.tex.orig
mv -f diff.tex new/"$main" mv -f diff.tex new/"$main"
verbose_done verbose_done
else else
verbose "Running latexdiff ${latexdiffopt[@]} old/$main new/$main > ./diff.tex" verbose "Running latexdiff ${latexdiffopt[@]} old/$main new/$main > ./diff.tex"
latexdiff "${latexdiffopt[@]}" old/"$main" new/"$main" > diff.tex || die "latexdiff failed"
latexdiff "${latexdiffopt[@]}" old/"$main" new/"$main" > diff.tex \
|| die "latexdiff failed"
verbose_done verbose_done
verbose "mv ./diff.tex new/$main" verbose "mv ./diff.tex new/$main"
mv -f new/"$main" new/"$main.orig" mv -f new/"$main" new/"$main.orig"
mv -f diff.tex new/"$main" mv -f diff.tex new/"$main"
@ -539,7 +545,7 @@ case "$cleanup" in
"all") "all")
verbose "Cleaning-up result" verbose "Cleaning-up result"
cd .. cd ..
cd ..
cd ..
rm -fr "$tmpdir" rm -fr "$tmpdir"
verbose_done verbose_done
;; ;;

Loading…
Cancel
Save