From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35DEDC282CE for ; Mon, 3 Jun 2019 21:48:55 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0CD2823A48 for ; Mon, 3 Jun 2019 21:48:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0CD2823A48 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:41293 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hXup4-0000aj-34 for qemu-devel@archiver.kernel.org; Mon, 03 Jun 2019 17:48:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39706) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hXunh-0008F2-Rm for qemu-devel@nongnu.org; Mon, 03 Jun 2019 17:47:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hXunX-00031k-6S for qemu-devel@nongnu.org; Mon, 03 Jun 2019 17:47:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49122) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hXunN-0002Nz-Fq; Mon, 03 Jun 2019 17:47:11 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6024181E07; Mon, 3 Jun 2019 21:46:58 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-164.bos.redhat.com [10.18.17.164]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3B4935C219; Mon, 3 Jun 2019 21:46:54 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Mon, 3 Jun 2019 17:46:50 -0400 Message-Id: <20190603214653.29369-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 03 Jun 2019 21:47:03 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 0/3] Add QMP lexer for annotated JSON to Sphinx X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Peter Maydell , John Snow , Aarushi Mehta , Eduardo Habkost Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" QMP isn't json. It turns out Pygments cares about this. Teach Pygments to go with the annotated flow. V3: - Also annotate elision indicators '...', which cause problems in Sphinx 2.1+ - Adjust setup.py to cope with future versions of Sphinx that change the add_lexer interface V2: - Change GPL2 to GPLv2+ (Peter Maydell) - Change "highlights" to "lexes" in docstrings - Fix typo ("Sphinx()" =3D> "Sphinx") in docstring Reported-by: Aarushi Mehta John Snow (3): docs/interop/bitmaps.rst: Fix typos sphinx: add qmp_lexer docs/bitmaps: use QMP lexer instead of json docs/conf.py | 4 +-- docs/interop/bitmaps.rst | 58 ++++++++++++++++++++-------------------- docs/sphinx/qmp_lexer.py | 43 +++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 31 deletions(-) create mode 100644 docs/sphinx/qmp_lexer.py --=20 2.20.1