Re: [virtio] Re: towards draft 3 / virtio 1.0

[Pawel Moll <pawel.moll@arm.com>]

On Thu, 2014-06-26 at 13:36 +0100, Michael S. Tsirkin wrote:
> OK I pushed what I have into svn for now.
> Still tweaking it, current is r392
> This is the patch on top,  if I apply it I
> can not create the pdf.

I have no idea what did you do to it since yesterday ;-)

Nevertheless, it builds again for me with this:

8<--------------------------
diff --git a/diffpreamble.tex b/diffpreamble.tex
index 6242878..b9c8e00 100644
--- a/diffpreamble.tex
+++ b/diffpreamble.tex
@@ -4,16 +4,16 @@
 
 %DIF FONTSTRIKE PREAMBLE
 \RequirePackage[normalem]{ulem}
-\providecommand{\DIFadd}[1]{{\sf #1}}
-\providecommand{\DIFdel}[1]{{\footnotesize \sout{#1}}}
+\providecommand{\DIFadd}[1]{{\color{blue}\sf #1}}
+\providecommand{\DIFdel}[1]{{\color{red}\footnotesize \sout{#1}}}
 %DIF END FONTSTRIKE PREAMBLE
 
 %DIF COLOR PREAMBLE
 \RequirePackage{color}
-\providecommand{\DIFaddbegin}{\protect\color{blue}\hypersetup{linkcolor=blue,urlcolor=blue}}
-\providecommand{\DIFaddend}{\protect\color{black}\hypersetup{linkcolor=pinegreen,urlcolor=pinegreen}}
-\providecommand{\DIFdelbegin}{\protect\color{red}\hypersetup{linkcolor=red,urlcolor=red}}
-\providecommand{\DIFdelend}{\protect\color{black}\hypersetup{linkcolor=pinegreen,urlcolor=pinegreen}}
+\providecommand{\DIFaddbegin}{\begingroup\color{blue}\hypersetup{linkcolor=blue,urlcolor=blue}}
+\providecommand{\DIFaddend}{\hypersetup{linkcolor=pinegreen,urlcolor=pinegreen}\endgroup}
+\providecommand{\DIFdelbegin}{\begingroup\color{red}\hypersetup{linkcolor=red,urlcolor=red}}
+\providecommand{\DIFdelend}{\hypersetup{linkcolor=pinegreen,urlcolor=pinegreen}\endgroup}
 %DIF END COLOR PREAMBLE
 \providecommand{\DIFaddtext}[1]{\textcolor{blue}{\sf #1}}
 \providecommand{\DIFdeltext}[1]{\textcolor{red}{\footnotesize \sout{#1}}}
diff --git a/makediff.sh b/makediff.sh
index 460b593..6657292 100755
--- a/makediff.sh
+++ b/makediff.sh
@@ -35,5 +35,5 @@ sed 's/\\footnote{/\\footnote {/' new/flat.tex > new/flat-fixed.tex
 #cp 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 --append-safecmd=field --ignore-warnings -p diffpreamble.tex old/flat-fixed.tex new/flat-fixed.tex > virtio-diff.tex
-perl -pi fixupdiff.pl virtio-diff.tex
+latexdiff-fast --config "FLOATENV=(?:figure|table|tabular|plate)[\w\d*@]*" --append-safecmd=field --ignore-warnings -p diffpreamble.tex old/flat-fixed.tex new/flat-fixed.tex > virtio-diff.tex
+#perl -pi fixupdiff.pl virtio-diff.tex