OASIS Virtual I/O Device (VIRTIO) TC

OK I'm assuming we'll finalize draft 3 next week, here's a list of things I think we should do differently from draft 2 - listing here so we don't forget. 1. Include list of changes/issues addressed - I think we can import from Jira 2. Acknowledge contributions from non TC members 3. Create a revision with highlighted changes since draft 2 change bars seem too hard, requires more low level xetex knowledge than I have. Simplest fix is to insert tags to color new text specially, for bonus points - add old text crossed-out. I think all text changes should be there tomorrow at the latest, then we can start addressing the above items. We also need to go over issues in Jira, make sure environment is set to mention the commenter's address, and "fixed in version" field is set to draft 3. If there are issues we closed without fixing, need to find them in some way. We don't reject too much so can be done manually for now, but maybe we should start filling in "fixed in version" field for rejected issues too. Can we do this? If we set fixed in version everywhere correctly, Chet will be able to get the list of addressed issues from jira automatically, which is good. -- MST

"Michael S. Tsirkin" <mst@redhat.com> writes: > OK I'm assuming we'll finalize draft 3 next week, > here's a list of things I think we should do > differently from draft 2 - listing here so we don't forget. > > > 1. Include list of changes/issues addressed - I think > we can import from Jira Agreed, thanks. > 2. Acknowledge contributions from non TC members Definitely. > 3. Create a revision with highlighted changes since draft 2 > change bars seem too hard, requires more low level > xetex knowledge than I have. > Simplest fix is to insert tags to color new text specially, for > bonus points - add old text crossed-out. Yes, I'm currently thinking we provide a marked-up PDF version with cross-outs for the changes. > We also need to go over issues in Jira, make sure > environment is set to mention the commenter's address, > and "fixed in version" field is set to draft 3. > If there are issues we closed without fixing, need > to find them in some way. > We don't reject too much so can be done manually for now, > but maybe we should start filling in "fixed in version" field > for rejected issues too. Can we do this? Yes, we should. > If we set fixed in version everywhere correctly, > Chet will be able to get the list of addressed issues > from jira automatically, which is good. Indeed. Which of these do you want me to do? Cheers, Rusty.

On Sat, Jun 21, 2014 at 04:55:48PM +0930, Rusty Russell wrote: > "Michael S. Tsirkin" <mst@redhat.com> writes: > > OK I'm assuming we'll finalize draft 3 next week, > > here's a list of things I think we should do > > differently from draft 2 - listing here so we don't forget. > > > > > > 1. Include list of changes/issues addressed - I think > > we can import from Jira > > Agreed, thanks. > > > 2. Acknowledge contributions from non TC members > > Definitely. > > > 3. Create a revision with highlighted changes since draft 2 > > change bars seem too hard, requires more low level > > xetex knowledge than I have. > > Simplest fix is to insert tags to color new text specially, for > > bonus points - add old text crossed-out. > > Yes, I'm currently thinking we provide a marked-up PDF version with > cross-outs for the changes. > > > We also need to go over issues in Jira, make sure > > environment is set to mention the commenter's address, > > and "fixed in version" field is set to draft 3. > > If there are issues we closed without fixing, need > > to find them in some way. > > We don't reject too much so can be done manually for now, > > but maybe we should start filling in "fixed in version" field > > for rejected issues too. Can we do this? > > Yes, we should. > > > If we set fixed in version everywhere correctly, > > Chet will be able to get the list of addressed issues > > from jira automatically, which is good. > > Indeed. > > Which of these do you want me to do? > > Cheers, > Rusty. I started on 3, but got stuck: once we spread enough color annotations around the document, latex seems to freak out around middle of the document and start coloring everything the same. Pawel, could you take a look please? All you need to do is apply the patch I sent (adding shell script for generating the diff) then run this script and look at the result.

On Mon, 2014-06-23 at 15:46 +0100, Michael S. Tsirkin wrote: > Pawel, could you take a look please? > All you need to do is apply the patch I sent > (adding shell script for generating the diff) > then run this script and look at the result. I see that you found a workaround, but for what its worth, the following diffpreamble.tex does the trick for me: 8<----------------------------------------- %DIF FONTSTRIKE PREAMBLE RequirePackage[normalem]{ulem} providecommand{DIFaddtex}[1]{{color{blue}sf #1}} providecommand{DIFdeltex}[1]{{color{red}footnotesize sout{#1}}} %DIF END FONTSTRIKE PREAMBLE %DIF COLOR PREAMBLE RequirePackage{xcolor} providecommand{DIFaddbegin}{} providecommand{DIFaddend}{} providecommand{DIFdelbegin}{} providecommand{DIFdelend}{} %DIF END COLOR PREAMBLE % Standard DIFadd and DIFdel are redefined as DIFaddtex and DIFdeltex % when hyperref package is included. %DIF HYPERREF PREAMBLE providecommand{DIFadd}[1]{ exorpdfstring{DIFaddtex{#1}}{#1}} providecommand{DIFdel}[1]{ exorpdfstring{DIFdeltex{#1}}{}} %DIF END HYPERREF PACKAGE %DIF FLOATSAFE PREAMBLE: SEEMS UNUSED BUT JUST IN CASE providecommand{DIFaddFL}[1]{DIFadd{#1}} providecommand{DIFdelFL}[1]{DIFdel{#1}} providecommand{DIFaddbeginFL}{} providecommand{DIFaddendFL}{} providecommand{DIFdelbeginFL}{} providecommand{DIFdelendFL}{} %DIF END FLOATSAFE PREAMBLE 8<----------------------------------------- Pawel

On Tue, 2014-06-24 at 17:20 +0100, Pawel Moll wrote: > RequirePackage{xcolor} PS. You can ignore the change color->xcolor. It's just a leftover from some experiments.

On Tue, Jun 24, 2014 at 05:20:48PM +0100, Pawel Moll wrote: > On Mon, 2014-06-23 at 15:46 +0100, Michael S. Tsirkin wrote: > > Pawel, could you take a look please? > > All you need to do is apply the patch I sent > > (adding shell script for generating the diff) > > then run this script and look at the result. > > I see that you found a workaround, but for what its worth, the following > diffpreamble.tex does the trick for me: > > 8<----------------------------------------- > %DIF FONTSTRIKE PREAMBLE > RequirePackage[normalem]{ulem} > providecommand{DIFaddtex}[1]{{color{blue}sf #1}} > providecommand{DIFdeltex}[1]{{color{red}footnotesize sout{#1}}} > %DIF END FONTSTRIKE PREAMBLE > %DIF COLOR PREAMBLE > RequirePackage{xcolor} > providecommand{DIFaddbegin}{} > providecommand{DIFaddend}{} > providecommand{DIFdelbegin}{} > providecommand{DIFdelend}{} Interesting. I am guessing this won't cover all cases as well as my hack does though. For example: DIFaddbegin item[DEVICE_NEEDS_RESET (64)] DIFadd{Indicates that the device has experienced an error from which it can't recover. } DEVICE_NEEDS_RESET won't be blue, will it? > %DIF END COLOR PREAMBLE > % Standard DIFadd and DIFdel are redefined as DIFaddtex and DIFdeltex > % when hyperref package is included. > %DIF HYPERREF PREAMBLE > providecommand{DIFadd}[1]{ exorpdfstring{DIFaddtex{#1}}{#1}} > providecommand{DIFdel}[1]{ exorpdfstring{DIFdeltex{#1}}{}} > %DIF END HYPERREF PACKAGE > > %DIF FLOATSAFE PREAMBLE: SEEMS UNUSED BUT JUST IN CASE > providecommand{DIFaddFL}[1]{DIFadd{#1}} > providecommand{DIFdelFL}[1]{DIFdel{#1}} > providecommand{DIFaddbeginFL}{} > providecommand{DIFaddendFL}{} > providecommand{DIFdelbeginFL}{} > providecommand{DIFdelendFL}{} > %DIF END FLOATSAFE PREAMBLE > 8<----------------------------------------- > > Pawel

On Tue, 2014-06-24 at 18:22 +0100, Michael S. Tsirkin wrote: > Interesting. > I am guessing this won't cover all cases as well > as my hack does though. > For example: > > DIFaddbegin item[DEVICE_NEEDS_RESET (64)] DIFadd{Indicates that the > device has experienced > an error from which it can't recover. > } > > DEVICE_NEEDS_RESET won't be blue, will it? Correct, it wouldn't. But I think I found an answer to this as well. We need to add extend FLOATENV to cover tabular environment as well, so the latexdiff invocation looks like this: 8<----------- latexdiff-fast -p diffpreamble.tex old/flat.tex new/flat.tex --config "FLOATENV=(?:figure table tabular plate)[wd*@]*" > virtio-diff.tex 8<----------- and the diffpreamble.tex like this: 8<----------- %DIF FONTSTRIKE PREAMBLE RequirePackage[normalem]{ulem} providecommand{DIFaddtex}[1]{sf #1} providecommand{DIFdeltex}[1]{footnotesize sout{#1}} %DIF END FONTSTRIKE PREAMBLE %DIF COLOR PREAMBLE RequirePackage{color} providecommand{DIFaddbegin}{egingroupcolor{blue}} providecommand{DIFaddend}{endgroup} providecommand{DIFdelbegin}{egingroupcolor{red}hypersetup{linkcolor=red,urlcolor=red}} providecommand{DIFdelend}{hypersetup{linkcolor=green,urlcolor=green}endgroup} %DIF END COLOR PREAMBLE % Standard DIFadd and DIFdel are redefined as DIFaddtex and DIFdeltex % when hyperref package is included. %DIF HYPERREF PREAMBLE providecommand{DIFadd}[1]{ exorpdfstring{DIFaddtex{#1}}{#1}} providecommand{DIFdel}[1]{ exorpdfstring{DIFdeltex{#1}}{}} %DIF END HYPERREF PACKAGE %DIF FLOATSAFE PREAMBLE: SEEMS UNUSED BUT JUST IN CASE providecommand{DIFaddFL}[1]{{color{blue}DIFadd{#1}}} providecommand{DIFdelFL}[1]{{color{red}DIFdel{#1}}} providecommand{DIFaddbeginFL}{} providecommand{DIFaddendFL}{} providecommand{DIFdelbeginFL}{} providecommand{DIFdelendFL}{} %DIF END FLOATSAFE PREAMBLE 8<----------- Pawel

On Wed, Jun 25, 2014 at 01:17:53PM +0100, Pawel Moll wrote: > On Tue, 2014-06-24 at 18:22 +0100, Michael S. Tsirkin wrote: > > Interesting. > > I am guessing this won't cover all cases as well > > as my hack does though. > > For example: > > > > DIFaddbegin item[DEVICE_NEEDS_RESET (64)] DIFadd{Indicates that the > > device has experienced > > an error from which it can't recover. > > } > > > > DEVICE_NEEDS_RESET won't be blue, will it? > > Correct, it wouldn't. But I think I found an answer to this as well. We > need to add extend FLOATENV to cover tabular environment as well, so the > latexdiff invocation looks like this: OK I will try this but I note this gives us back DIFaddbegin/DIFaddend. You are saying with egingroup/endgroup color stack overflow errors go away? How about footnotes? Is there a way to fix them without an external script? Would be nice if the footnote mark was also crossed-out ... And since I'm asking for ponies anyway ... do you happen to understand why does latexdiff do this: DIFdelbegin DIFdel{.}footnote{DIFdeltext{In this case, deflation advice is merely a courtesy }} %DIFAUXCMD addtocounter{footnote}{-1}%DIFAUXCMD DIFdelend DIFaddbegin footnote{DIFaddtext{In this case, deflation advice is merely a courtesy. }}DIFadd{. }DIFaddend why does it not detect that we merely added a single dot at the end? It seems to do if fine in other cases. > 8<----------- > latexdiff-fast -p diffpreamble.tex old/flat.tex new/flat.tex --config "FLOATENV=(?:figure table tabular plate)[wd*@]*" > virtio-diff.tex > 8<----------- > > and the diffpreamble.tex like this: > > 8<----------- > %DIF FONTSTRIKE PREAMBLE > RequirePackage[normalem]{ulem} > providecommand{DIFaddtex}[1]{sf #1} > providecommand{DIFdeltex}[1]{footnotesize sout{#1}} > %DIF END FONTSTRIKE PREAMBLE > %DIF COLOR PREAMBLE > RequirePackage{color} > providecommand{DIFaddbegin}{egingroupcolor{blue}} > providecommand{DIFaddend}{endgroup} > providecommand{DIFdelbegin}{egingroupcolor{red}hypersetup{linkcolor=red,urlcolor=red}} > providecommand{DIFdelend}{hypersetup{linkcolor=green,urlcolor=green}endgroup} > %DIF END COLOR PREAMBLE > % Standard DIFadd and DIFdel are redefined as DIFaddtex and DIFdeltex > % when hyperref package is included. > %DIF HYPERREF PREAMBLE > providecommand{DIFadd}[1]{ exorpdfstring{DIFaddtex{#1}}{#1}} > providecommand{DIFdel}[1]{ exorpdfstring{DIFdeltex{#1}}{}} > %DIF END HYPERREF PACKAGE > > %DIF FLOATSAFE PREAMBLE: SEEMS UNUSED BUT JUST IN CASE > providecommand{DIFaddFL}[1]{{color{blue}DIFadd{#1}}} > providecommand{DIFdelFL}[1]{{color{red}DIFdel{#1}}} > providecommand{DIFaddbeginFL}{} > providecommand{DIFaddendFL}{} > providecommand{DIFdelbeginFL}{} > providecommand{DIFdelendFL}{} > %DIF END FLOATSAFE PREAMBLE > 8<----------- > > Pawel

On Wed, 2014-06-25 at 13:24 +0100, Michael S. Tsirkin wrote: > OK I will try this but I note this gives us back > DIFaddbegin/DIFaddend. > You are saying with egingroup/endgroup color stack > overflow errors go away? Yes. Commands like color apply to a single group, usually marked with curly brackets {xxx}, with group and egingroup (there's some subtle difference I don't really understand; enough to say that group didn't work for me ;-). I have no idea why are they pushed to a stack, if there seem to be no pop operation, but just enclosing a change in a separate group seems enough. That's what my first proposal did (notice extra {} in DIFaddtex), but as you pointed out it missed some bits. > How about footnotes? > Is there a way to fix them without an external script? > Would be nice if the footnote mark was also crossed-out ... Right, my first version did it, then I forgot to check it. Anyway, this (slightly suboptimal, but I couldn't care less) should cover all cases (I see footnotes on page 59 coloured): 8<---------------------- %DIF FONTSTRIKE PREAMBLE RequirePackage[normalem]{ulem} providecommand{DIFaddtex}[1]{color{blue}sf #1} providecommand{DIFdeltex}[1]{color{red}footnotesize sout{#1}} %DIF END FONTSTRIKE PREAMBLE %DIF COLOR PREAMBLE RequirePackage{color} providecommand{DIFaddbegin}{egingroupcolor{blue}} providecommand{DIFaddend}{endgroup} providecommand{DIFdelbegin}{egingroup color{red}hypersetup{linkcolor=red,urlcolor=red}} providecommand{DIFdelend}{hypersetup{linkcolor=green,urlcolor=green}endgroup} %DIF END COLOR PREAMBLE % Standard DIFadd and DIFdel are redefined as DIFaddtex and DIFdeltex % when hyperref package is included. %DIF HYPERREF PREAMBLE providecommand{DIFadd}[1]{ exorpdfstring{DIFaddtex{#1}}{#1}} providecommand{DIFdel}[1]{ exorpdfstring{DIFdeltex{#1}}{}} %DIF END HYPERREF PACKAGE %DIF FLOATSAFE PREAMBLE: SEEMS UNUSED BUT JUST IN CASE providecommand{DIFaddFL}[1]{DIFaddtex{#1}} providecommand{DIFdelFL}[1]{DIFdeltex{#1}} providecommand{DIFaddbeginFL}{} providecommand{DIFaddendFL}{} providecommand{DIFdelbeginFL}{} providecommand{DIFdelendFL}{} %DIF END FLOATSAFE PREAMBLE 8<---------------------- > And since I'm asking for ponies anyway ... do > you happen to understand why does latexdiff do this: > DIFdelbegin DIFdel{.}footnote{DIFdeltext{In this case, deflation > advice is merely a courtesy > }} > %DIFAUXCMD > addtocounter{footnote}{-1}%DIFAUXCMD > DIFdelend DIFaddbegin footnote{DIFaddtext{In this case, deflation > advice is merely a courtesy. > }}DIFadd{. > }DIFaddend > > why does it not detect that we merely added a single dot at the end? > > It seems to do if fine in other cases.

On Wed, Jun 25, 2014 at 01:54:24PM +0100, Pawel Moll wrote: > On Wed, 2014-06-25 at 13:24 +0100, Michael S. Tsirkin wrote: > > OK I will try this but I note this gives us back > > DIFaddbegin/DIFaddend. > > You are saying with egingroup/endgroup color stack > > overflow errors go away? > > Yes. Commands like color apply to a single group, usually marked with > curly brackets {xxx}, with group and egingroup (there's some subtle > difference I don't really understand; enough to say that group didn't > work for me ;-). I have no idea why are they pushed to a stack, if there > seem to be no pop operation, but just enclosing a change in a separate > group seems enough. That's what my first proposal did (notice extra {} > in DIFaddtex), but as you pointed out it missed some bits. > > > How about footnotes? > > Is there a way to fix them without an external script? > > Would be nice if the footnote mark was also crossed-out ... > > Right, my first version did it, then I forgot to check it. Anyway, this > (slightly suboptimal, but I couldn't care less) should cover all cases > (I see footnotes on page 59 coloured): Hmm fails build for me [46] Chapter 5. ! Missing endgroup inserted. <inserted text> endgroup l.3613 DIFaddbegin DIFadd{18 }& DIFadd{Input device }\ > 8<---------------------- > %DIF FONTSTRIKE PREAMBLE > RequirePackage[normalem]{ulem} > providecommand{DIFaddtex}[1]{color{blue}sf #1} > providecommand{DIFdeltex}[1]{color{red}footnotesize sout{#1}} > %DIF END FONTSTRIKE PREAMBLE > %DIF COLOR PREAMBLE > RequirePackage{color} > providecommand{DIFaddbegin}{egingroupcolor{blue}} > providecommand{DIFaddend}{endgroup} > providecommand{DIFdelbegin}{egingroup > color{red}hypersetup{linkcolor=red,urlcolor=red}} > providecommand{DIFdelend}{hypersetup{linkcolor=green,urlcolor=green}endgroup} > %DIF END COLOR PREAMBLE > % Standard DIFadd and DIFdel are redefined as DIFaddtex and > DIFdeltex > % when hyperref package is included. > %DIF HYPERREF PREAMBLE > providecommand{DIFadd}[1]{ exorpdfstring{DIFaddtex{#1}}{#1}} > providecommand{DIFdel}[1]{ exorpdfstring{DIFdeltex{#1}}{}} > %DIF END HYPERREF PACKAGE this should not be needed: latexdiff adds it itself. And we can make it DIFadd/DIFdel above - it will rename them to DIFaddtex/DIFdeltex. Right? > > %DIF FLOATSAFE PREAMBLE: SEEMS UNUSED BUT JUST IN CASE > providecommand{DIFaddFL}[1]{DIFaddtex{#1}} > providecommand{DIFdelFL}[1]{DIFdeltex{#1}} > providecommand{DIFaddbeginFL}{} > providecommand{DIFaddendFL}{} > providecommand{DIFdelbeginFL}{} > providecommand{DIFdelendFL}{} > %DIF END FLOATSAFE PREAMBLE > 8<---------------------- > > > > And since I'm asking for ponies anyway ... do > > you happen to understand why does latexdiff do this: > > DIFdelbegin DIFdel{.}footnote{DIFdeltext{In this case, deflation > > advice is merely a courtesy > > }} > > %DIFAUXCMD > > addtocounter{footnote}{-1}%DIFAUXCMD > > DIFdelend DIFaddbegin footnote{DIFaddtext{In this case, deflation > > advice is merely a courtesy. > > }}DIFadd{. > > }DIFaddend > > > > why does it not detect that we merely added a single dot at the end? > > > > It seems to do if fine in other cases. > > > > --------------------------------------------------------------------- > To unsubscribe from this mail list, you must leave the OASIS TC that > generates this mail. Follow this link to all your TCs in OASIS at: > https://www.oasis-open.org/apps/org/workgroup/portal/my_workgroups.php

On Wed, 2014-06-25 at 19:29 +0100, Michael S. Tsirkin wrote: > On Wed, Jun 25, 2014 at 01:54:24PM +0100, Pawel Moll wrote: > > On Wed, 2014-06-25 at 13:24 +0100, Michael S. Tsirkin wrote: > > > OK I will try this but I note this gives us back > > > DIFaddbegin/DIFaddend. > > > You are saying with egingroup/endgroup color stack > > > overflow errors go away? > > > > Yes. Commands like color apply to a single group, usually marked with > > curly brackets {xxx}, with group and egingroup (there's some subtle > > difference I don't really understand; enough to say that group didn't > > work for me ;-). I have no idea why are they pushed to a stack, if there > > seem to be no pop operation, but just enclosing a change in a separate > > group seems enough. That's what my first proposal did (notice extra {} > > in DIFaddtex), but as you pointed out it missed some bits. > > > > > How about footnotes? > > > Is there a way to fix them without an external script? > > > Would be nice if the footnote mark was also crossed-out ... > > > > Right, my first version did it, then I forgot to check it. Anyway, this > > (slightly suboptimal, but I couldn't care less) should cover all cases > > (I see footnotes on page 59 coloured): > > Hmm fails build for me > [46] > Chapter 5. > ! Missing endgroup inserted. > <inserted text> > endgroup > l.3613 DIFaddbegin DIFadd{18 }& > DIFadd{Input device }\ Have you added --config "FLOATENV=(?:figure table tabular plate)[wd*@]*" to the latexdiff command line? (I mentioned that in one of the mails before. > > 8<---------------------- > > %DIF FONTSTRIKE PREAMBLE > > RequirePackage[normalem]{ulem} > > providecommand{DIFaddtex}[1]{color{blue}sf #1} > > providecommand{DIFdeltex}[1]{color{red}footnotesize sout{#1}} > > %DIF END FONTSTRIKE PREAMBLE > > %DIF COLOR PREAMBLE > > RequirePackage{color} > > providecommand{DIFaddbegin}{egingroupcolor{blue}} > > providecommand{DIFaddend}{endgroup} > > providecommand{DIFdelbegin}{egingroup > > color{red}hypersetup{linkcolor=red,urlcolor=red}} > > providecommand{DIFdelend}{hypersetup{linkcolor=green,urlcolor=green}endgroup} > > %DIF END COLOR PREAMBLE > > % Standard DIFadd and DIFdel are redefined as DIFaddtex and > > DIFdeltex > > % when hyperref package is included. > > %DIF HYPERREF PREAMBLE > > providecommand{DIFadd}[1]{ exorpdfstring{DIFaddtex{#1}}{#1}} > > providecommand{DIFdel}[1]{ exorpdfstring{DIFdeltex{#1}}{}} > > %DIF END HYPERREF PACKAGE > > this should not be needed: latexdiff adds it itself. > And we can make it DIFadd/DIFdel above - it will rename them > to DIFaddtex/DIFdeltex. > Right? I'm not sure which bit do you refer to? Anyway, only with this version I've managed to get colors in the normal text flow, in the tables and in the footnotes. On Thu, 2014-06-26 at 07:52 +0100, Michael S. Tsirkin wrote: > The one on page 78 does not seem coloured. It's fine here - see attached. Pawel Attachment: virtio-v1.0-csprd02.pdf Description: Adobe PDF document

On Thu, Jun 26, 2014 at 10:52:43AM +0100, Pawel Moll wrote: > On Wed, 2014-06-25 at 19:29 +0100, Michael S. Tsirkin wrote: > > On Wed, Jun 25, 2014 at 01:54:24PM +0100, Pawel Moll wrote: > > > On Wed, 2014-06-25 at 13:24 +0100, Michael S. Tsirkin wrote: > > > > OK I will try this but I note this gives us back > > > > DIFaddbegin/DIFaddend. > > > > You are saying with egingroup/endgroup color stack > > > > overflow errors go away? > > > > > > Yes. Commands like color apply to a single group, usually marked with > > > curly brackets {xxx}, with group and egingroup (there's some subtle > > > difference I don't really understand; enough to say that group didn't > > > work for me ;-). I have no idea why are they pushed to a stack, if there > > > seem to be no pop operation, but just enclosing a change in a separate > > > group seems enough. That's what my first proposal did (notice extra {} > > > in DIFaddtex), but as you pointed out it missed some bits. > > > > > > > How about footnotes? > > > > Is there a way to fix them without an external script? > > > > Would be nice if the footnote mark was also crossed-out ... > > > > > > Right, my first version did it, then I forgot to check it. Anyway, this > > > (slightly suboptimal, but I couldn't care less) should cover all cases > > > (I see footnotes on page 59 coloured): > > > > Hmm fails build for me > > [46] > > Chapter 5. > > ! Missing endgroup inserted. > > <inserted text> > > endgroup > > l.3613 DIFaddbegin DIFadd{18 }& > > DIFadd{Input device }\ > > Have you added > > --config "FLOATENV=(?:figure table tabular plate)[wd*@]*" > > to the latexdiff command line? (I mentioned that in one of the mails > before. Hmm it still fails for me: ! LaTeX Error: Missing egin{document}. See the LaTeX manual or LaTeX Companion for explanation. Type H <return> for immediate help. ... l.334 providecommand {DIFaddtex}[1]{ exorpdfstring{DIFaddtex{#1}}{#1}} %D... > > > 8<---------------------- > > > %DIF FONTSTRIKE PREAMBLE > > > RequirePackage[normalem]{ulem} > > > providecommand{DIFaddtex}[1]{color{blue}sf #1} > > > providecommand{DIFdeltex}[1]{color{red}footnotesize sout{#1}} > > > %DIF END FONTSTRIKE PREAMBLE > > > %DIF COLOR PREAMBLE > > > RequirePackage{color} > > > providecommand{DIFaddbegin}{egingroupcolor{blue}} > > > providecommand{DIFaddend}{endgroup} > > > providecommand{DIFdelbegin}{egingroup > > > color{red}hypersetup{linkcolor=red,urlcolor=red}} > > > providecommand{DIFdelend}{hypersetup{linkcolor=green,urlcolor=green}endgroup} > > > %DIF END COLOR PREAMBLE > > > % Standard DIFadd and DIFdel are redefined as DIFaddtex and > > > DIFdeltex > > > % when hyperref package is included. > > > %DIF HYPERREF PREAMBLE > > > providecommand{DIFadd}[1]{ exorpdfstring{DIFaddtex{#1}}{#1}} > > > providecommand{DIFdel}[1]{ exorpdfstring{DIFdeltex{#1}}{}} > > > %DIF END HYPERREF PACKAGE > > > > this should not be needed: latexdiff adds it itself. > > And we can make it DIFadd/DIFdel above - it will rename them > > to DIFaddtex/DIFdeltex. > > Right? > > I'm not sure which bit do you refer to? Anyway, only with this version > I've managed to get colors in the normal text flow, in the tables and in > the footnotes. > > On Thu, 2014-06-26 at 07:52 +0100, Michael S. Tsirkin wrote: > > The one on page 78 does not seem coloured. > > It's fine here - see attached. > > Pawel

On Thu, Jun 26, 2014 at 10:52:43AM +0100, Pawel Moll wrote: > On Wed, 2014-06-25 at 19:29 +0100, Michael S. Tsirkin wrote: > > On Wed, Jun 25, 2014 at 01:54:24PM +0100, Pawel Moll wrote: > > > On Wed, 2014-06-25 at 13:24 +0100, Michael S. Tsirkin wrote: > > > > OK I will try this but I note this gives us back > > > > DIFaddbegin/DIFaddend. > > > > You are saying with egingroup/endgroup color stack > > > > overflow errors go away? > > > > > > Yes. Commands like color apply to a single group, usually marked with > > > curly brackets {xxx}, with group and egingroup (there's some subtle > > > difference I don't really understand; enough to say that group didn't > > > work for me ;-). I have no idea why are they pushed to a stack, if there > > > seem to be no pop operation, but just enclosing a change in a separate > > > group seems enough. That's what my first proposal did (notice extra {} > > > in DIFaddtex), but as you pointed out it missed some bits. > > > > > > > How about footnotes? > > > > Is there a way to fix them without an external script? > > > > Would be nice if the footnote mark was also crossed-out ... > > > > > > Right, my first version did it, then I forgot to check it. Anyway, this > > > (slightly suboptimal, but I couldn't care less) should cover all cases > > > (I see footnotes on page 59 coloured): > > > > Hmm fails build for me > > [46] > > Chapter 5. > > ! Missing endgroup inserted. > > <inserted text> > > endgroup > > l.3613 DIFaddbegin DIFadd{18 }& > > DIFadd{Input device }\ > > Have you added > > --config "FLOATENV=(?:figure table tabular plate)[wd*@]*" > > to the latexdiff command line? (I mentioned that in one of the mails > before. 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. diff --git a/diffpreamble.tex b/diffpreamble.tex index 6242878..0a674a0 100644 --- a/diffpreamble.tex +++ b/diffpreamble.tex @@ -4,27 +4,23 @@ %DIF FONTSTRIKE PREAMBLE RequirePackage[normalem]{ulem} -providecommand{DIFadd}[1]{{sf #1}} -providecommand{DIFdel}[1]{{footnotesize sout{#1}}} +providecommand{DIFaddtex}[1]{color{pinegreen}sf #1} +providecommand{DIFdeltex}[1]{color{red}footnotesize sout{#1}} %DIF END FONTSTRIKE PREAMBLE - %DIF COLOR PREAMBLE RequirePackage{color} -providecommand{DIFaddbegin}{protectcolor{blue}hypersetup{linkcolor=blue,urlcolor=blue}} -providecommand{DIFaddend}{protectcolor{black}hypersetup{linkcolor=pinegreen,urlcolor=pinegreen}} -providecommand{DIFdelbegin}{protectcolor{red}hypersetup{linkcolor=red,urlcolor=red}} -providecommand{DIFdelend}{protectcolor{black}hypersetup{linkcolor=pinegreen,urlcolor=pinegreen}} +providecommand{DIFaddbegin}{egingroupcolor{blue}} +providecommand{DIFaddend}{endgroup} +providecommand{DIFdelbegin}{egingroup +color{red}hypersetup{linkcolor=red,urlcolor=red}} +providecommand{DIFdelend}{hypersetup{linkcolor=blue,urlcolor=blue}endgroup} %DIF END COLOR PREAMBLE -providecommand{DIFaddtext}[1]{ extcolor{blue}{sf #1}} -providecommand{DIFdeltext}[1]{ extcolor{red}{footnotesize sout{#1}}} - -%DIF FLOATSAFE PREAMBLE: SEEMS UNUSED BUT JUST IN CASE -providecommand{DIFaddFL}[1]{DIFadd{#1}} -providecommand{DIFdelFL}[1]{DIFdel{#1}} -providecommand{DIFaddbeginFL}{} -providecommand{DIFaddendFL}{} -providecommand{DIFdelbeginFL}{} -providecommand{DIFdelendFL}{} -%DIF END FLOATSAFE PREAMBLE +% Standard DIFadd and DIFdel are redefined as DIFaddtex and +DIFdeltex +% when hyperref package is included. +%DIF HYPERREF PREAMBLE +providecommand{DIFadd}[1]{ exorpdfstring{DIFaddtex{#1}}{#1}} +providecommand{DIFdel}[1]{ exorpdfstring{DIFdeltex{#1}}{}} +%DIF END HYPERREF PACKAGE %% diffpreable.tex end 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)[wd*@]*" --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

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}{protectcolor{blue}hypersetup{linkcolor=blue,urlcolor=blue}} -providecommand{DIFaddend}{protectcolor{black}hypersetup{linkcolor=pinegreen,urlcolor=pinegreen}} -providecommand{DIFdelbegin}{protectcolor{red}hypersetup{linkcolor=red,urlcolor=red}} -providecommand{DIFdelend}{protectcolor{black}hypersetup{linkcolor=pinegreen,urlcolor=pinegreen}} +providecommand{DIFaddbegin}{egingroupcolor{blue}hypersetup{linkcolor=blue,urlcolor=blue}} +providecommand{DIFaddend}{hypersetup{linkcolor=pinegreen,urlcolor=pinegreen}endgroup} +providecommand{DIFdelbegin}{egingroupcolor{red}hypersetup{linkcolor=red,urlcolor=red}} +providecommand{DIFdelend}{hypersetup{linkcolor=pinegreen,urlcolor=pinegreen}endgroup} %DIF END COLOR PREAMBLE providecommand{DIFaddtext}[1]{ extcolor{blue}{sf #1}} providecommand{DIFdeltext}[1]{ extcolor{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)[wd*@]*" --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

On Thu, Jun 26, 2014 at 02:04:23PM +0100, Pawel Moll wrote: > 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 ;-) Great, this works, thanks! I applied the following on top, this way it works in HTML format output too: diff --git a/diffpreamble.tex b/diffpreamble.tex index b9c8e00..d5d1966 100644 --- a/diffpreamble.tex +++ b/diffpreamble.tex @@ -4,8 +4,8 @@ %DIF FONTSTRIKE PREAMBLE RequirePackage[normalem]{ulem} -providecommand{DIFadd}[1]{{color{blue}sf #1}} -providecommand{DIFdel}[1]{{color{red}footnotesize sout{#1}}} +providecommand{DIFadd}[1]{protect extcolor{blue}{sf #1}} +providecommand{DIFdel}[1]{protect extcolor{red}{footnotesize sout{#1}}} %DIF END FONTSTRIKE PREAMBLE %DIF COLOR PREAMBLE

On Wed, Jun 25, 2014 at 01:54:24PM +0100, Pawel Moll wrote: > On Wed, 2014-06-25 at 13:24 +0100, Michael S. Tsirkin wrote: > > OK I will try this but I note this gives us back > > DIFaddbegin/DIFaddend. > > You are saying with egingroup/endgroup color stack > > overflow errors go away? > > Yes. Commands like color apply to a single group, usually marked with > curly brackets {xxx}, with group and egingroup (there's some subtle > difference I don't really understand; enough to say that group didn't > work for me ;-). I have no idea why are they pushed to a stack, if there > seem to be no pop operation, but just enclosing a change in a separate > group seems enough. That's what my first proposal did (notice extra {} > in DIFaddtex), but as you pointed out it missed some bits. > > > How about footnotes? > > Is there a way to fix them without an external script? > > Would be nice if the footnote mark was also crossed-out ... > > Right, my first version did it, then I forgot to check it. Anyway, this > (slightly suboptimal, but I couldn't care less) should cover all cases > (I see footnotes on page 59 coloured): The one on page 78 does not seem coloured. -- MST

Sorry, forgot about your last question... On Wed, 2014-06-25 at 13:24 +0100, Michael S. Tsirkin wrote: > And since I'm asking for ponies anyway ... do > you happen to understand why does latexdiff do this: > DIFdelbegin DIFdel{.}footnote{DIFdeltext{In this case, deflation > advice is merely a courtesy > }} > %DIFAUXCMD > addtocounter{footnote}{-1}%DIFAUXCMD > DIFdelend DIFaddbegin footnote{DIFaddtext{In this case, deflation > advice is merely a courtesy. > }}DIFadd{. > }DIFaddend > > why does it not detect that we merely added a single dot at the end? > > It seems to do if fine in other cases. Have no idea - I never used latexdiff before :-) If I was to guess it treats command arguments in some special way, comparing to normal text flow. Pawel

On Sat, Jun 21, 2014 at 04:55:48PM +0930, Rusty Russell wrote: > "Michael S. Tsirkin" <mst@redhat.com> writes: > > OK I'm assuming we'll finalize draft 3 next week, > > here's a list of things I think we should do > > differently from draft 2 - listing here so we don't forget. > > > > > > 1. Include list of changes/issues addressed - I think > > we can import from Jira > > Agreed, thanks. > > > 2. Acknowledge contributions from non TC members > > Definitely. > > > 3. Create a revision with highlighted changes since draft 2 > > change bars seem too hard, requires more low level > > xetex knowledge than I have. > > Simplest fix is to insert tags to color new text specially, for > > bonus points - add old text crossed-out. > > Yes, I'm currently thinking we provide a marked-up PDF version with > cross-outs for the changes. OK this seems to be done, when you need to generate it just run the script. > > We also need to go over issues in Jira, make sure > > environment is set to mention the commenter's address, > > and "fixed in version" field is set to draft 3. > > If there are issues we closed without fixing, need > > to find them in some way. > > We don't reject too much so can be done manually for now, > > but maybe we should start filling in "fixed in version" field > > for rejected issues too. Can we do this? > > Yes, we should. > > > If we set fixed in version everywhere correctly, > > Chet will be able to get the list of addressed issues > > from jira automatically, which is good. > > Indeed. > > Which of these do you want me to do? > > Cheers, > Rusty. Can you do this last item? Will make item 1 easier. -- MST

"Michael S. Tsirkin" <mst@redhat.com> writes: > On Sat, Jun 21, 2014 at 04:55:48PM +0930, Rusty Russell wrote: >> "Michael S. Tsirkin" <mst@redhat.com> writes: >> > If we set fixed in version everywhere correctly, >> > Chet will be able to get the list of addressed issues >> > from jira automatically, which is good. >> >> Indeed. >> >> Which of these do you want me to do? >> >> Cheers, >> Rusty. > > Can you do this last item? Will make item 1 easier. OK, I've gone through them and updated as required. Now if you search for "Fix version: virtio 1.0 csprd03" you get all the issues which were resolved, deferred or closed for draft3. Michael, when you're happy with the draft, do you want to upload the copies into the TC document directory (see https://www.oasis-open.org/resources/tcadmin/approving-a-committee-specification-or-note-draft ) and post an update here? Then we can have some time to review it before the meeting. Thanks! Rusty.