From nobody Sat Nov 15 16:32:35 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1750265802; cv=none; d=zohomail.com; s=zohoarc; b=fhV9PsWAxFwG/0hGl8jV826+id2W6MaM56Kznq/En5bUETawshopSn0Hfe1siZU4rRRXD6UDH1XDUVW88gvl3G/AdLmwpK5D2+1pfqWKVXvCXyeY2Ko+0JB1CgjkiBPQo9dSuZ/qvtmLn9gZzD8T59ORt+vhWTj4GYYYaPIUjsE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750265802; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=WA2NiORHMUeglBWJeEmDtQ3FRSv9SINoOXQuxQfxgpw=; b=mTbPWh8FRt0hTEUDXNZ2DfBsmwsRH+8DTM2gEP91ypdzNlIT9H3tw4TQ8ZF8D58mza8dI4rDxkyQ5tyRK6ph3SiFFyWpW+K1EUWII517k1dudgBO5cNl1WKrrVurbkbH3zXZw1uEBb+TIxtQwmOquH9flVfzBQNLYAN43r8yMQg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750265802649333.67975531574564; Wed, 18 Jun 2025 09:56:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRw3X-0006LN-It; Wed, 18 Jun 2025 12:54:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uRw3O-0006Hu-TB for qemu-devel@nongnu.org; Wed, 18 Jun 2025 12:54:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uRw3N-0007sU-8r for qemu-devel@nongnu.org; Wed, 18 Jun 2025 12:54:26 -0400 Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-595-szOZ2FWJNmCC0MP7-XyFjg-1; Wed, 18 Jun 2025 12:54:21 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4B96419560B3; Wed, 18 Jun 2025 16:54:18 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.74]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5EC1530001B7; Wed, 18 Jun 2025 16:54:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750265664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WA2NiORHMUeglBWJeEmDtQ3FRSv9SINoOXQuxQfxgpw=; b=c0f09l+GMUJXWox4tiHgcuJGEnr6VFMJgz/hLtShG2fkSODFVJm/ICj3pwsKJIgUZtsVKf ScWXmfU6s2GSvbLeq2VXBewVC4xvVjk9emr415xpQLpXQIsrn3KzmiUCtdq4O7HxNNL5Iq 0Pey4PCLoVXYos0Mrm45QHgCRKBKtLY= X-MC-Unique: szOZ2FWJNmCC0MP7-XyFjg-1 X-Mimecast-MFC-AGG-ID: szOZ2FWJNmCC0MP7-XyFjg_1750265658 From: John Snow To: qemu-devel@nongnu.org Cc: Jiri Pirko , Fan Ni , Stefano Garzarella , Michael Roth , "Gonglei (Arei)" , Stefan Hajnoczi , Vladimir Sementsov-Ogievskiy , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-block@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Jonathan Cameron , Fabiano Rosas , Kashyap Chamarthy , "Michael S. Tsirkin" , Yanan Wang , Stefan Berger , John Snow , Igor Mammedov , Gerd Hoffmann , Hanna Reitz , Mads Ynddal , Ani Sinha , Zhao Liu , Marcel Apfelbaum , Kevin Wolf , Eric Blake , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Peter Xu , Cleber Rosa , Eduardo Habkost , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Konstantin Kostiuk , Peter Maydell , Alex Williamson , Zhenwei Pi , Jason Wang , Lukas Straub , Markus Armbruster Subject: [PATCH v3 2/5] docs/sphinx: parse @references in freeform text Date: Wed, 18 Jun 2025 12:53:50 -0400 Message-ID: <20250618165353.1980365-3-jsnow@redhat.com> In-Reply-To: <20250618165353.1980365-1-jsnow@redhat.com> References: <20250618165353.1980365-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -39 X-Spam_score: -4.0 X-Spam_bar: ---- X-Spam_report: (-4.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.895, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1750265803818116600 Content-Type: text/plain; charset="utf-8" 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 --- 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 5374dee8fad..adc14ade456 100644 --- a/docs/sphinx/qapidoc.py +++ b/docs/sphinx/qapidoc.py @@ -218,6 +218,11 @@ def generate_field( typ =3D self.format_type(member) self.add_field(kind, member.name, body, info, typ) =20 + @staticmethod + def reformat_arobase(text: str) -> str: + """ reformats @var to ``var`` """ + return re.sub(r"@([\w-]+)", r"``\1``", text) + # Transmogrification helpers =20 def visit_paragraph(self, section: QAPIDoc.Section) -> None: @@ -361,8 +366,7 @@ def visit_sections(self, ent: QAPISchemaDefinition) -> = None: =20 # Add sections in source order: for i, section in enumerate(sections): - # @var is translated to ``var``: - section.text =3D re.sub(r"@([\w-]+)", r"``\1``", section.text) + section.text =3D self.reformat_arobase(section.text) =20 if section.kind =3D=3D QAPIDoc.Kind.PLAIN: self.visit_paragraph(section) @@ -405,7 +409,7 @@ def visit_freeform(self, doc: QAPIDoc) -> None: =20 assert len(doc.all_sections) =3D=3D 1, doc.all_sections body =3D doc.all_sections[0] - text =3D body.text + text =3D self.reformat_arobase(body.text) info =3D doc.info =20 if re.match(r"=3D+ ", text): --=20 2.48.1