diff options
| author | mstsirkin <mstsirkin@0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652> | 2015-03-15 11:10:49 +0000 |
|---|---|---|
| committer | mstsirkin <mstsirkin@0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652> | 2015-03-15 11:10:49 +0000 |
| commit | f612f689e7e97df615294f090b14d06a31fdabab (patch) | |
| tree | 6eb19c11603f3f3c92367ab2f55f8060b75da7e5 | |
| parent | c9873341c915886263023cd7e30320c5c9736c6f (diff) | |
makediff: work around for lstlisting
latexdiff seems to go wild trying to diff lstlisting.
But marking lstlisting as picture - so old text is
commented out - then removing the comment sign -
seems to work, with the only disadvantage being
that listing is diffed as a whole.
Seems to be the best I can come up with ATM.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@484 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652
| -rw-r--r-- | fixupdiff.pl | 14 | ||||
| -rwxr-xr-x | makediff.sh | 8 |
2 files changed, 19 insertions, 3 deletions
diff --git a/fixupdiff.pl b/fixupdiff.pl new file mode 100644 index 0000000..70d4e30 --- /dev/null +++ b/fixupdiff.pl @@ -0,0 +1,14 @@ +my $lstlisting=0; +while (<>) { + my $line = $_; + if (m/%DIFDELCMD\s+<\s+\\begin{lstlisting}/) { + $lstlisting=1; + } + if ($lstlisting) { + $line =~ s/%DIFDELCMD\s+<\s+//; + } + print $line; + if (m/%DIFDELCMD\s+<\s+\\end{lstlisting}/) { + $lstlisting=0; + } +} diff --git a/makediff.sh b/makediff.sh index b7e6831..dc2efff 100755 --- a/makediff.sh +++ b/makediff.sh @@ -50,6 +50,8 @@ sed 's/\\footnote{/\\footnote {/' new/flat.tex > new/flat-fixed.tex #wget http://mirror.math.ku.edu/tex-archive/support/latexdiff/latexdiff-fast #chmod +x latexdiff-fast latexdiff-fast --config \ -"FLOATENV=(?:figure|longtable|table|tabular|plate)[\w\d*@]*" \ - --append-safecmd=field --append-textcmd=mmioreg --ignore-warnings -p diffpreamble.tex old/flat-fixed.tex new/flat-fixed.tex > virtio-diff.tex -#perl -pi fixupdiff.pl virtio-diff.tex +"FLOATENV=(?:figure|longtable|table|tabular|plate|lstlisting)[\w\d*@]*,PICTUREENV=(?:picture|DIFnomarkup|lstlisting)[\w\d*@]*" \ + --append-safecmd=field --append-textcmd=mmioreg \ +--ignore-warnings -p diffpreamble.tex old/flat-fixed.tex \ +new/flat-fixed.tex > virtio-diff-tofix.tex +perl fixupdiff.pl virtio-diff-tofix.tex > virtio-diff.tex |