This series switches all our QAPI doc comments over from
texinfo format to rST.
Changes v1->v2:
* rebased (a few minor conflicts fixed)
* I have fixed the failures to pass "make check"
* minor tweaks to commit messages etc (noted in individual patches)
* the old patch 12 ('qapi: Explicitly put "foo: dropped in n.n" notes
into Notes section') has been deleted
* patch 18 ('qapi: Delete all the "foo: dropped in n.n" notes')
* I have not made the change to be more consistent about treating
an apparent heading-comment with trailing lines of rST the same
way as we would treat one with leading lines of rST, just because
the whole area of how we handle headings is up in the air anyway.
If we decide the approach here is basically right I'll make this
change in a v3; otherwise it's likely to be moot anyway.
* I have also not added a patch that rewraps long lines added
by some of the earlier doc-comment adjustments; I figure we
can come back and do that later.
* I haven't (yet) written an extra patch that tries to guess
what might be a good sphinx-build binary to use (none of my
systems put it anywhere except 'sphinx-build')
The intention here is that the first part of this series (1-17) is
uncontroversial cleanups to the existing doc comment syntax;
much of it has been reviewed already.
Patches 1-17 should be OK to commit now. Of those:
Reviewed: 1, 2, 3, 4, 5, 8, 10, 11, 12, 13, 16, 17
To review: 6, 7, 9, 14, 15
new patch 18 replaces "qapi: Explicitly put "foo: dropped in n.n" notes
into Notes section"; as suggested by Markus we just delete all the
dropped-in notes. There should probably be an update to qemu-deprecated.texi,
but that is beyond my area of expertise; Markus said he'd have a look.
Patch 19 ("qapi/qapi-schema.json: Put headers in their own doc-comment blocks")
and onwards are the meat of the patchset, and still need review.
The following explanation of the series is mostly the same as the v1
cover letter, but I have added a note about the lack of 'make check'
testing of the rST generator, and an attempt at better explaining the
changes in the handling of headings.
The basic approach is somewhat similar to how we deal with kerneldoc
and hxtool: we have a custom Sphinx extension which is passed a
filename which is the json file it should run the QAPI parser over and
generate documentation for. Unlike 'kerneldoc' but somewhat like
hxtool, I have chosed to generate documentation by generating a tree
of docutils nodes, rather than by generating rST source that is then
fed to the rST parser to generate docutils nodes. Individual lumps of
doc comment go to the rST parser, but the structured parts we render
directly. This makes it easier to get the structure and heading level
nesting correct.
Rather than trying to exactly handle all the existing comments I have
opted (as Markus suggested) to tweak them where this seemed more
sensible than contorting the rST generator to deal with
weirdnesses. The principal changes are:
* whitespace is now significant, and multiline definitions must have
their second and subsequent lines indented to match the first line
* general rST format markup is permitted, not just the small set of
markup the old texinfo generator handled. For most things (notably
bulleted and itemized lists) the old format is the same as rST was.
* Specific things that might trip people up:
- instead of *bold* and _italic_ rST has **bold** and *italic*
- lists need a preceding and following blank line
- a lone literal '*' will need to be backslash-escaped to
avoid a rST syntax error
* the old leading '|' for example (literal text) blocks is replaced
by the standard rST '::' literal block.
* headings and subheadings must now be in a freeform documentation
comment of their own
* we support arbitrary levels of sub- and sub-sub-heading, not just a
main and sub-heading like the old texinfo generator
* as a special case, @foo is retained and is equivalent to ``foo``
This policy means that most of the patch series is cleanups to the doc
comments:
- doc comments missing the ':' after @argument (misrenders
in the texi, is a syntax error for rST)
- doc comments with indent that doesn't match the tightened
requirements (no effect on the texi, but rST cares)
- some lists needed leading/trailing blank lines adding
- a graph intended to be rendered as ascii-art wasn't correctly
marked up as a literal block (misrenders in the texi, syntax error
for rST)
- some stray hardcoded tab characters needed changing to spaces
- in a few places parts of a doc comment were in the wrong order
resulting in it being rendered into the wrong section by mistake
- a few instances of texinfo `quotes' needed to be changed to rST
'quotes'; similarly _this_ isn't valid rST markup, and in one place
a literal * needed backslash-escaping
- numerous places were trying to have lists without using the list
markup, which renders as weird run-on sentences
- the two places which define headings in the middle of a doc comment
are changed to put the heading definition in the
standalone-comment-block that the new generator wants (no change to
the texinfo output)
Patch 9 changes 663 lines in 20 files but it is purely a whitespace
change (verifiable with 'git show -w'). The other patches are
generally smaller and straightforward.
All of these patches except for the "escape a literal '*'" one at the
end have either no/minimal effect on the generated texinfo or fix
misrenderings.
Moving on to the actual code changes:
* we start by changing the existing parser code to be more careful
with leading whitespace: instead of stripping it all, it strips
only the amount required for indented multiline definitions, and
complains if it finds an unexpected de-indent. The texinfo
generator code is updated to do whitespace stripping itself, so
there is no change to the generated texi source.
* then we add the new qapidoc Sphinx extension, which is not yet used
by anything. This is a 500 line script, all added in one patch. I
can split it if people think that would help, but I'm not sure I
see a good split point.
* then we can convert the two generated reference documents, one at a
time. This is mostly just updating makefile rules and the like.
* after that we can do some minor tweaks to doc comments that would
have confused the texinfo parser: changing our two instances of
'|'-markup literal blocks to rST '::' literal blocks, and adding
some headings to the GA reference so the rST interop manual ToC
looks better.
* finally, we can delete the old texinfo machinery and update the
markup docs in docs/devel/qapi-code-gen.txt
On headings:
Because the rST generator works by assembling a tree of docutils
nodes, it needs to know the structure of the document, in the
sense that it wants to know that there is a "section with a level
1 heading titled Foo", which contains "section with a level 2
heading titled Bar", which in turn contains the documentation for
commands Baz, Boz, Buz. This means we can't follow the texinfo
generator's approach of just treating '= Foo' as another kind
of markup to be turned into a '@section' texinfo and otherwise
just written out into the output stream. Instead we need to
be able to distinguish "this is a level 1 section heading"
from any other kind of doc-comment, and the user shouldn't be
able to insert directives specifying changes in the document
structure randomly in the middle of what would otherwise be a
lump of "just rST source to be fed to a rST parser".
The approach I've taken to letting the generator know the structure
is to special-case headings into "must be in their own freeform
doc-comment as a single line", like this:
##
# = Foo
##
This is easy to spot in the 'freeform' method, and matches how
we already mark up headings in almost all cases. An alternative
approach would be to have parser.py detect heading markup, so
that instead of
for doc in schema.docs:
if doc.symbol:
vis.symbol(doc, schema.lookup_entity(doc.symbol))
else:
vis.freeform(doc)
(ie "everything the parser gives you is either documenting
a symbol, or it is a freefrom comment") we have:
for doc in schema.docs:
if doc.symbol:
vis.symbol(doc, schema.lookup_entity(doc.symbol))
else if doc.is_section_header:
vis.new_section(doc.heading_text, doc.heading_level)
else:
vis.freeform(doc)
(ie "everything the parser gives you is either documenting
a symbol, or a notification about the structure of the document,
or a freeform comment".) I feel that would be less simple than
we currently have, though.
There are a few things I have left out of this initial series:
* unlike the texinfo, there is no generation of index entries
or an index in the HTML docs
* although there are HTML anchors on all the command/object/etc
headings, they are not stable but just serial-number based
tags like '#qapidoc-35', so not suitable for trying to link
to from other parts of the docs
* unlike the old texinfo generation, we make no attempt to regression
test the rST generation in 'make check'. This is trickier than
the texinfo equivalent, because we never generate rST source
that we could compare against a golden reference. Comparing
against generated HTML is liable to break with new Sphinx
versions; trying to compare the data structure of docutils nodes
would be a bit more robust but would require a bunch of code to
mock up running Sphinx somehow.
My view is that we can add niceties like this later; the series
already seems big enough to me.
You can find the HTML rendered version of the results
of this series at:
http://people.linaro.org/~peter.maydell/qdoc-snapshot/interop/qemu-ga-ref.html
http://people.linaro.org/~peter.maydell/qdoc-snapshot/interop/qemu-qmp-ref.html
(look also at
http://people.linaro.org/~peter.maydell/qdoc-snapshot/interop/index.html
if you want to see how the ToC for the interop manual comes out)
The manpages are
http://people.linaro.org/~peter.maydell/qemu-ga-ref.7
http://people.linaro.org/~peter.maydell/qemu-qmp-ref.7
(download and render with 'man -l path/to/foo.7')
For comparison, the old texinfo-to-HTML versions of the docs are:
https://www.qemu.org/docs/master/qemu-ga-ref.html
https://www.qemu.org/docs/master/qemu-qmp-ref.html
Git branch of this series also available at
https://git.linaro.org/people/peter.maydell/qemu-arm.git sphinx-conversions
thanks
-- PMM
Peter Maydell (30):
configure: Allow user to specify sphinx-build binary
configure: Check that sphinx-build is using Python 3
Makefile: Fix typo in dependency list for interop manpages
qga/qapi-schema.json: Fix missing '-' in GuestDiskBusType doc comment
qga/qapi-schema.json: Fix indent level on doc comments
qga/qapi-schema.json: minor format fixups for rST
qapi/block-core.json: Use literal block for ascii art
qapi: Use ':' after @argument in doc comments
qapi: Fix indent level on doc comments in json files
qapi: Remove hardcoded tabs
qapi/ui.json: Put input-send-event body text in the right place
qapi/ui.json: Avoid `...' texinfo style quoting
qapi/block-core.json: Use explicit bulleted lists
qapi/ui.json: Use explicit bulleted lists
qapi/{block,misc,tmp,net}.json: Use explicit bulleted lists
qapi: Add blank lines before bulleted lists
qapi/migration.json: Replace _this_ with *this*
qapi: Delete all the "foo: dropped in n.n" notes
qapi/qapi-schema.json: Put headers in their own doc-comment blocks
qapi/machine.json: Escape a literal '*' in doc comment
tests/qapi/doc-good.json: Clean up markup
scripts/qapi: Move doc-comment whitespace stripping to doc.py
scripts/qapi/parser.py: improve doc comment indent handling
docs/sphinx: Add new qapi-doc Sphinx extension
docs/interop: Convert qemu-ga-ref to rST
docs/interop: Convert qemu-qmp-ref to rST
qapi: Use rST markup for literal blocks
qga/qapi-schema.json: Add some headings
scripts/qapi: Remove texinfo generation support
docs/devel/qapi-code-gen.txt: Update to new rST backend conventions
docs/devel/qapi-code-gen.txt | 90 ++-
configure | 22 +-
Makefile | 58 +-
tests/Makefile.include | 15 +-
qapi/block-core.json | 1127 ++++++++++++++++---------------
qapi/block.json | 47 +-
qapi/char.json | 10 +-
qapi/dump.json | 4 +-
qapi/introspect.json | 12 +-
qapi/job.json | 32 +-
qapi/machine-target.json | 18 +-
qapi/machine.json | 16 +-
qapi/migration.json | 206 +++---
qapi/misc-target.json | 8 +-
qapi/misc.json | 138 ++--
qapi/net.json | 26 +-
qapi/qapi-schema.json | 18 +-
qapi/qdev.json | 10 +-
qapi/qom.json | 4 +-
qapi/rocker.json | 12 +-
qapi/run-state.json | 34 +-
qapi/sockets.json | 8 +-
qapi/tpm.json | 4 +-
qapi/trace.json | 15 +-
qapi/transaction.json | 4 +-
qapi/ui.json | 117 ++--
qga/qapi-schema.json | 168 ++---
tests/qapi-schema/doc-good.json | 25 +-
MAINTAINERS | 3 +-
docs/conf.py | 16 +-
docs/index.html.in | 2 -
docs/interop/conf.py | 4 +
docs/interop/index.rst | 2 +
docs/interop/qemu-ga-ref.rst | 4 +
docs/interop/qemu-ga-ref.texi | 80 ---
docs/interop/qemu-qmp-ref.rst | 4 +
docs/interop/qemu-qmp-ref.texi | 80 ---
docs/sphinx/qapidoc.py | 504 ++++++++++++++
scripts/qapi-gen.py | 2 -
scripts/qapi/doc.py | 301 ---------
scripts/qapi/gen.py | 7 -
scripts/qapi/parser.py | 94 ++-
tests/qapi-schema/doc-good.out | 22 +-
tests/qapi-schema/doc-good.texi | 287 --------
44 files changed, 1751 insertions(+), 1909 deletions(-)
create mode 100644 docs/interop/qemu-ga-ref.rst
delete mode 100644 docs/interop/qemu-ga-ref.texi
create mode 100644 docs/interop/qemu-qmp-ref.rst
delete mode 100644 docs/interop/qemu-qmp-ref.texi
create mode 100644 docs/sphinx/qapidoc.py
delete mode 100644 scripts/qapi/doc.py
delete mode 100644 tests/qapi-schema/doc-good.texi
--
2.20.1