qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: stefanha@redhat.com, John Snow <jsnow@redhat.com>
Subject: [PULL 02/32] docs/sphinx: parse @references in freeform text
Date: Mon, 14 Jul 2025 15:44:28 +0200	[thread overview]
Message-ID: <20250714134458.2991097-3-armbru@redhat.com> (raw)
In-Reply-To: <20250714134458.2991097-1-armbru@redhat.com>

From: John Snow <jsnow@redhat.com>

Oversight in the new qapidoc transmogrifier: @references in freeform
documentation blocks were not being transformed to literals. This fixes
that, and the next patch ensures that we're testing for this O:-)

Signed-off-by: John Snow <jsnow@redhat.com>
Message-ID: <20250618165353.1980365-3-jsnow@redhat.com>
Acked-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 docs/sphinx/qapidoc.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/docs/sphinx/qapidoc.py b/docs/sphinx/qapidoc.py
index 5374dee8fa..adc14ade45 100644
--- a/docs/sphinx/qapidoc.py
+++ b/docs/sphinx/qapidoc.py
@@ -218,6 +218,11 @@ def generate_field(
         typ = self.format_type(member)
         self.add_field(kind, member.name, body, info, typ)
 
+    @staticmethod
+    def reformat_arobase(text: str) -> str:
+        """ reformats @var to ``var`` """
+        return re.sub(r"@([\w-]+)", r"``\1``", text)
+
     # Transmogrification helpers
 
     def visit_paragraph(self, section: QAPIDoc.Section) -> None:
@@ -361,8 +366,7 @@ def visit_sections(self, ent: QAPISchemaDefinition) -> None:
 
         # Add sections in source order:
         for i, section in enumerate(sections):
-            # @var is translated to ``var``:
-            section.text = re.sub(r"@([\w-]+)", r"``\1``", section.text)
+            section.text = self.reformat_arobase(section.text)
 
             if section.kind == QAPIDoc.Kind.PLAIN:
                 self.visit_paragraph(section)
@@ -405,7 +409,7 @@ def visit_freeform(self, doc: QAPIDoc) -> None:
 
         assert len(doc.all_sections) == 1, doc.all_sections
         body = doc.all_sections[0]
-        text = body.text
+        text = self.reformat_arobase(body.text)
         info = doc.info
 
         if re.match(r"=+ ", text):
-- 
2.49.0



  parent reply	other threads:[~2025-07-14 15:13 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-14 13:44 [PULL 00/32] QAPI patches patches for 2025-07-14 Markus Armbruster
2025-07-14 13:44 ` [PULL 01/32] docs/sphinx: adjust qapidoc to cope with same-line error sections Markus Armbruster
2025-07-14 13:44 ` Markus Armbruster [this message]
2025-07-14 13:44 ` [PULL 03/32] docs/sphinx: remove legacy QAPI manual generator Markus Armbruster
2025-07-14 13:44 ` [PULL 04/32] docs/sphinx: remove special parsing for freeform sections Markus Armbruster
2025-07-14 13:44 ` [PULL 05/32] qapi: lift restriction on using '=' in doc blocks Markus Armbruster
2025-07-14 13:44 ` [PULL 06/32] qapi: Clean up "This command will do ..." command descriptions Markus Armbruster
2025-07-14 13:44 ` [PULL 07/32] qapi: Clean up a few Errors: sections Markus Armbruster
2025-07-14 13:44 ` [PULL 08/32] docs/qapi-domain: add return-nodesc Markus Armbruster
2025-07-14 13:44 ` [PULL 09/32] qapi: Fix undocumented return values by generating something Markus Armbruster
2025-07-14 13:44 ` [PULL 10/32] qapi: remove trivial "Returns:" sections Markus Armbruster
2025-07-14 13:44 ` [PULL 11/32] qapi: rephrase return docs to avoid type name Markus Armbruster
2025-07-14 13:44 ` [PULL 12/32] qapi: add cross-references to acpi.json Markus Armbruster
2025-07-14 13:44 ` [PULL 13/32] qapi: add cross-references to authz.json Markus Armbruster
2025-07-14 13:44 ` [PULL 14/32] qapi: add cross-references to block layer Markus Armbruster
2025-07-14 13:44 ` [PULL 15/32] qapi: add cross-references to crypto.json Markus Armbruster
2025-07-14 13:44 ` [PULL 16/32] qapi: add cross-references to dump.json Markus Armbruster
2025-07-14 13:44 ` [PULL 17/32] qapi: add cross-references to job.json Markus Armbruster
2025-07-14 13:44 ` [PULL 18/32] qapi: add cross-references to Machine core Markus Armbruster
2025-07-14 13:44 ` [PULL 19/32] qapi: add cross-references to migration.json Markus Armbruster
2025-07-14 13:44 ` [PULL 20/32] qapi: add cross-references to net.json Markus Armbruster
2025-07-14 13:44 ` [PULL 21/32] qapi: add cross-references to pci.json Markus Armbruster
2025-07-14 13:44 ` [PULL 22/32] qapi: add cross-references to QOM Markus Armbruster
2025-07-14 13:44 ` [PULL 23/32] qapi: add cross-references to replay.json Markus Armbruster
2025-07-14 13:44 ` [PULL 24/32] qapi: add cross-references to run-state.json Markus Armbruster
2025-07-14 13:44 ` [PULL 25/32] qapi: add cross-references to sockets.json Markus Armbruster
2025-07-14 13:44 ` [PULL 26/32] qapi: add cross-references to ui.json Markus Armbruster
2025-07-14 13:44 ` [PULL 27/32] qapi: add cross-references to virtio.json Markus Armbruster
2025-07-14 13:44 ` [PULL 28/32] qapi: add cross-references to yank.json Markus Armbruster
2025-07-14 13:44 ` [PULL 29/32] qapi: add cross-references to misc modules Markus Armbruster
2025-07-14 13:44 ` [PULL 30/32] qom: qom-list-get Markus Armbruster
2025-07-14 13:44 ` [PULL 31/32] python: use qom-list-get Markus Armbruster
2025-07-14 13:44 ` [PULL 32/32] tests/qtest/qom-test: unit test for qom-list-get Markus Armbruster
2025-07-15  4:26 ` [PULL 00/32] QAPI patches patches for 2025-07-14 Stefan Hajnoczi
2025-07-15  6:30   ` Markus Armbruster

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250714134458.2991097-3-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).