From patchwork Thu Feb 13 17:56:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 183428 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp844480ile; Thu, 13 Feb 2020 10:20:13 -0800 (PST) X-Google-Smtp-Source: APXvYqwpy4L3kRO3yJu24UiNv1RJRmWWToWdmM/NhY7PUc5v488KkBtb+aC63kfqpoUwqqOCuaBD X-Received: by 2002:ac8:691a:: with SMTP id e26mr7899187qtr.287.1581618012999; Thu, 13 Feb 2020 10:20:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581618012; cv=none; d=google.com; s=arc-20160816; b=c2gecJ0jeRu5QwSWXUjt4YMe5NqVzuDgTCcObKXBnZJwF2RMQacF9uRY/l71h4Ijl9 UAln0oG2/QTKS0p5se0wQGoyB8IzLpGQXEO60Wg37canh9CJXDu/GPcft10W9VtD9ZRy OMaG76wnew50xs421YcnHOpGu9p1jnnFhL8TOhK6JTOUfH82175i7SDH4SwbLKZCNWwi eOlIlDwTLgNeuY0RSsspcib+3nYDXSv3j8rB/mlgGSySHVI1t7sfNq5CDxcoPyn6DCSG 7wCU+Al4P7flRQTIoqobRWZNhcIJmB8rXUdM7N6QAfEtAEw/tDOLZJsTuHBiysnALkoI cdXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=AtxEKrKRqNjfOrT9JbNHlMjgTudjr9VoMdnqfaiOYHo=; b=MzOB0HDhZuC/DbadS1N22UPiWyFd6SaYiVfDLehKJ0ZvZ7R6lofMPZQWW5rOGARaH2 wTVvjcXGUinY5PFPZ+31jrP/CUc0Lr4x6G8XJYbcYu6SkKgdhX9jVOJji3gb9FBahU5w VszzI8+IkRo9BPm/1TTrbo7V/LH27K/7tdivKSkYKqMH4RiwyJckgRgI4f6bR/Q78Oe5 RGgXujB9XjrNORKWmDVZQRR9if/iFS6wggD5zMJH6Q6sYQqgX4czxKwiwwyDvkqFhiAU FaDoFCWd0Bpq0hAo4Fu3Tj6Tw8LgIveqJRsbGicU8tESIa84MCg9rArSw9fYTkKfVzZl z5jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=I4+X7x9n; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w23si1677599qka.223.2020.02.13.10.20.12 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Feb 2020 10:20:12 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=I4+X7x9n; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2J5w-00064U-Hv for patch@linaro.org; Thu, 13 Feb 2020 13:20:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34866) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2Ik3-00015h-9T for qemu-devel@nongnu.org; Thu, 13 Feb 2020 12:57:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2Ik0-0003WG-Kp for qemu-devel@nongnu.org; Thu, 13 Feb 2020 12:57:35 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:34729) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j2Ik0-0003UU-DB for qemu-devel@nongnu.org; Thu, 13 Feb 2020 12:57:32 -0500 Received: by mail-wr1-x443.google.com with SMTP id n10so5873416wrm.1 for ; Thu, 13 Feb 2020 09:57:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AtxEKrKRqNjfOrT9JbNHlMjgTudjr9VoMdnqfaiOYHo=; b=I4+X7x9nkXMTo3cW1cxmLx38gFKcu8rtt/clXujOGlYgO52GPOYXm9m7aa5BaF+cuh FZgA8Zzf1dVhOJ2m+hGauORRaOpBG5SGgaZ8KBKbcbpHb/sFFUHJDug5MD9HgXR7ejjM CVVofs86mfTAkNntXKmQFKnIJ5+8VBQxrJ900CkNK0U/TDs0YLoXSkOzTSgU18jPyety tAGFB8yaVkHM10Zj+igXo4yiYuvuA77bwkgRFBSWo5N1nJIEv1zM1BiWggJUJbaR2gUr pwelvJH+WDrHyC5GnexthFbD6bSDPyLw0B+ncOK0hZjHo/X0maAFtcWVPU4C+VToDiLX /auA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AtxEKrKRqNjfOrT9JbNHlMjgTudjr9VoMdnqfaiOYHo=; b=a4CXxcyaFD89ucaavogANBMz1BK/9WSVO2KQsrz9b+2xXeuKFhsIvEi/YTKqrrj2PA e+Q+lw9KGZ5uFfOBSWrImkfZPKKw+iAdTbtgCdp0CScr/oRNsvFb3SuNtUjJIYx/7WVz d6BILHrRb5+U1KIqE57nbnrCEgkEIO1jbObVLyqHVEEK+yck8iKzPao8qQp3eBt2kr9C z04yc8SC7m4B0BPjPmTVwQDB1EL46R6iIYYaNzg09NR/syuuwlI8weI4ddbbjkrNlPYh LJD6bKURlJ5uyH6kAraJk5fLergE3eF96cP/xoHzatMGZfJZHRnxNh07YuDcBiNFYrr/ +qdw== X-Gm-Message-State: APjAAAWkIU9IiyPCbBj13t6mUB9GUD5W7FYajWU0x6A6m+YT8AEb3MaX SUIol1zeXPupEY1Uulv91mcV0diXFis= X-Received: by 2002:a5d:65c5:: with SMTP id e5mr22464807wrw.311.1581616651041; Thu, 13 Feb 2020 09:57:31 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id p26sm3692913wmc.24.2020.02.13.09.57.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2020 09:57:30 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH v2 30/30] docs/devel/qapi-code-gen.txt: Update to new rST backend conventions Date: Thu, 13 Feb 2020 17:56:47 +0000 Message-Id: <20200213175647.17628-31-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200213175647.17628-1-peter.maydell@linaro.org> References: <20200213175647.17628-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Markus Armbruster , Michael Roth , Stefan Hajnoczi , John Snow Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Update the documentation of QAPI document comment syntax to match the new rST backend requirements. 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 Signed-off-by: Peter Maydell --- docs/devel/qapi-code-gen.txt | 90 ++++++++++++++++++++++++------------ 1 file changed, 61 insertions(+), 29 deletions(-) -- 2.20.1 diff --git a/docs/devel/qapi-code-gen.txt b/docs/devel/qapi-code-gen.txt index 59d6973e1ec..688eb2a0237 100644 --- a/docs/devel/qapi-code-gen.txt +++ b/docs/devel/qapi-code-gen.txt @@ -795,21 +795,39 @@ See below for more on definition documentation. Free-form documentation may be used to provide additional text and structuring content. +==== Headings and subheadings ==== + +A free-form documentation comment containing a single line +which starts with some '=' symbols and then a space defines +a section heading: + + ## + # = This is a top level heading + ## + + ## + # This is a free-form comment which will go under the + # top level heading. + ## + + ## + # == This is a second level heading + ## + +Section headings must always be correctly nested, so you can only +define a third-level heading inside a second-level heading, and so +on. The documentation generator will catch nesting mistakes and report +a syntax error. ==== Documentation markup ==== -Comment text starting with '=' is a section title: +Documentation comments can use most rST markup. In particular, +a '::' literal block can be used for examples: - # = Section title - -Double the '=' for a subsection title: - - # == Subsection title - -'|' denotes examples: - - # | Text of the example, may span - # | multiple lines + # :: + # + # Text of the example, may span + # multiple lines '*' starts an itemized list: @@ -825,37 +843,35 @@ A decimal number followed by '.' starts a numbered list: # multiple lines # 2. Second item -The actual number doesn't matter. You could even use '*' instead of -'2.' for the second item. +The actual number doesn't matter. -Lists can't be nested. Blank lines are currently not supported within -lists. +Lists of either kind must be preceded and followed by a blank line. +If a list item's text spans multiple lines, then the second and +subsequent lines must be correctly indented to line up with the +first character of the first line. -Additional whitespace between the initial '#' and the comment text is -permitted. - -*foo* and _foo_ are for strong and emphasis styles respectively (they -do not work over multiple lines). @foo is used to reference a name in -the schema. +The usual '**strong**', '*emphasised*' and '``literal``' markup should +be used. If you need a single literal '*' you will need to backslash-escape it. +As an extension beyond the usual rST syntax, you can also +use '@foo' to reference a name in the schema; this is rendered +the same way as '``foo``'. Example: ## -# = Section -# == Subsection -# -# Some text foo with *strong* and _emphasis_ +# Some text foo with **bol** and *emphasis* # 1. with a list # 2. like that # # And some code: -# | $ echo foo -# | -> do this -# | <- get that # +# :: +# +# $ echo foo +# -> do this +# <- get that ## - ==== Definition documentation ==== Definition documentation, if present, must immediately precede the @@ -870,6 +886,12 @@ commands and events), member (for structs and unions), branch (for alternates), or value (for enums), and finally optional tagged sections. +Descriptions of arguments can span multiple lines; if they +do then the second and subsequent lines must be indented +to line up with the first character of the first line of the +description. The parser will report a syntax error if there +is insufficient indentation. + FIXME: the parser accepts these things in almost any order. FIXME: union branches should be described, too. @@ -883,6 +905,16 @@ The section ends with the start of a new section. A 'Since: x.y.z' tagged section lists the release that introduced the definition. +The text of a section can start on a new line, in +which case it must not be indented at all. It can also start +on the same line as the 'Note:', 'Returns:', etc tag. In this +case if it spans multiple lines then second and subsequent +lines must be indented to match the first. + +An 'Example' or 'Examples' section is automatically rendered +entirely as literal fixed-width text. In other sections, +the text is formatted, and rST markup can be used. + For example: ##