From nobody Sat Apr 27 01:18:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487597758474718.4636749713375; Mon, 20 Feb 2017 05:35:58 -0800 (PST) Received: from localhost ([::1]:38573 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cfo8B-0000Ip-QV for importer@patchew.org; Mon, 20 Feb 2017 08:35:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38258) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cfo6R-0007ks-UM for qemu-devel@nongnu.org; Mon, 20 Feb 2017 08:34:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cfo6O-00031h-1J for qemu-devel@nongnu.org; Mon, 20 Feb 2017 08:34:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49112) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cfo6N-0002zZ-SA for qemu-devel@nongnu.org; Mon, 20 Feb 2017 08:34:03 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D84797F36F for ; Mon, 20 Feb 2017 13:34:01 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-55.ams2.redhat.com [10.36.116.55]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1KDY0XL020044 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 20 Feb 2017 08:34:01 -0500 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id DB69C113864A; Mon, 20 Feb 2017 14:33:58 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 20 Feb 2017 14:33:57 +0100 Message-Id: <1487597638-28323-2-git-send-email-armbru@redhat.com> In-Reply-To: <1487597638-28323-1-git-send-email-armbru@redhat.com> References: <1487597638-28323-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 20 Feb 2017 13:34:01 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/2] qapi2texi: replace quotation by bold section name 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Marc-Andr=C3=A9 Lureau When we build qemu-qmp-ref.txt this causes texinfo to complain several times: "Negative repeat count does nothing at /usr/share/texinfo/Texinfo/Convert/Line.pm line 124." It also doesn't display correctly, because the "Notes" text disappears entirely in the HTML version because it thinks there's no actual quotation text. The text file output formatting is also not good. To solve those problems, remove usage of @quotation, and simply use bold face for the section name. Reported-by: Peter Maydell Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20170217093416.27688-1-marcandre.lureau@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- scripts/qapi2texi.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/scripts/qapi2texi.py b/scripts/qapi2texi.py index 83ded95..c1071c6 100755 --- a/scripts/qapi2texi.py +++ b/scripts/qapi2texi.py @@ -159,12 +159,10 @@ def texi_body(doc): func =3D texi_example =20 if name: - # FIXME the indentation produced by @quotation in .txt and - # .html output is confusing - body +=3D "\n@quotation %s\n%s\n@end quotation" % \ - (name, func(doc)) - else: - body +=3D func(doc) + # prefer @b over @strong, so txt doesn't translate it to *Foo:* + body +=3D "\n\n@b{%s:}\n" % name + + body +=3D func(doc) =20 return body =20 --=20 2.7.4 From nobody Sat Apr 27 01:18:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487597757851724.0967626232424; Mon, 20 Feb 2017 05:35:57 -0800 (PST) Received: from localhost ([::1]:38572 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cfo8B-0000HK-6r for importer@patchew.org; Mon, 20 Feb 2017 08:35:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38259) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cfo6R-0007ku-Ub for qemu-devel@nongnu.org; Mon, 20 Feb 2017 08:34:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cfo6O-00031v-4y for qemu-devel@nongnu.org; Mon, 20 Feb 2017 08:34:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56250) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cfo6N-0002zK-S4 for qemu-devel@nongnu.org; Mon, 20 Feb 2017 08:34:04 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B1D544E359; Mon, 20 Feb 2017 13:34:01 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-55.ams2.redhat.com [10.36.116.55]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1KDY0Oh013378 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 20 Feb 2017 08:34:01 -0500 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id DDD54113864D; Mon, 20 Feb 2017 14:33:58 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 20 Feb 2017 14:33:58 +0100 Message-Id: <1487597638-28323-3-git-send-email-armbru@redhat.com> In-Reply-To: <1487597638-28323-1-git-send-email-armbru@redhat.com> References: <1487597638-28323-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 20 Feb 2017 13:34:01 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/2] Makefile: Put VERSION info into version.texi rather than using -D 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: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Peter Maydell Unfortunately some older versions of makeinfo don't correctly handle the -D command line option and fail to set the variable. This then causes them to complain docs/qemu-ga-ref.texi:41: warning: undefined flag: VERSION Work around this by doing as the autotools do, and writing the information into a version.texi file which we then include from the .texi files that need it. Signed-off-by: Peter Maydell Reviewed-by: Eric Blake Message-Id: <1487357968-31000-1-git-send-email-peter.maydell@linaro.org> Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Markus Armbruster --- .gitignore | 1 + Makefile | 17 ++++++++++------- docs/qemu-ga-ref.texi | 2 ++ docs/qemu-qmp-ref.texi | 2 ++ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index c563dc1..2849d75 100644 --- a/.gitignore +++ b/.gitignore @@ -107,6 +107,7 @@ docs/qemu-ga-ref.info* docs/qemu-qmp-ref.info* /qemu-ga-qapi.texi /qemu-qapi.texi +/version.texi *.tps .stgit-* cscope.* diff --git a/Makefile b/Makefile index 830fa5a..1c4c04f 100644 --- a/Makefile +++ b/Makefile @@ -516,7 +516,7 @@ distclean: clean rm -f qemu-doc.vr qemu-doc.txt rm -f config.log rm -f linux-headers/asm - rm -f qemu-ga-qapi.texi qemu-qapi.texi + rm -f qemu-ga-qapi.texi qemu-qapi.texi version.texi rm -f docs/qemu-qmp-ref.7 docs/qemu-ga-ref.7 rm -f docs/qemu-qmp-ref.txt docs/qemu-ga-ref.txt rm -f docs/qemu-qmp-ref.pdf docs/qemu-ga-ref.pdf @@ -663,21 +663,24 @@ ui/console-gl.o: $(SRC_PATH)/ui/console-gl.c \ =20 # documentation MAKEINFO=3Dmakeinfo -MAKEINFOFLAGS=3D--no-split --number-sections -D 'VERSION $(VERSION)' -TEXIFLAG=3D$(if $(V),,--quiet) --command=3D'@set VERSION $(VERSION)' +MAKEINFOFLAGS=3D--no-split --number-sections +TEXIFLAG=3D$(if $(V),,--quiet) =20 -%.html: %.texi +version.texi: $(SRC_PATH)/VERSION + $(call quiet-command,echo "@set VERSION $(VERSION)" > $@,"GEN","$@") + +%.html: %.texi version.texi $(call quiet-command,LC_ALL=3DC $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers= \ --html $< -o $@,"GEN","$@") =20 -%.info: %.texi +%.info: %.texi version.texi $(call quiet-command,$(MAKEINFO) $(MAKEINFOFLAGS) $< -o $@,"GEN","$@") =20 -%.txt: %.texi +%.txt: %.texi version.texi $(call quiet-command,LC_ALL=3DC $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers= \ --plaintext $< -o $@,"GEN","$@") =20 -%.pdf: %.texi +%.pdf: %.texi version.texi $(call quiet-command,texi2pdf $(TEXIFLAG) -I $(SRC_PATH) -I . $< -o $@,"G= EN","$@") =20 qemu-options.texi: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool diff --git a/docs/qemu-ga-ref.texi b/docs/qemu-ga-ref.texi index 87cc8d0..ddb76ce 100644 --- a/docs/qemu-ga-ref.texi +++ b/docs/qemu-ga-ref.texi @@ -1,6 +1,8 @@ \input texinfo @setfilename qemu-ga-ref.info =20 +@include version.texi + @exampleindent 0 @paragraphindent 0 =20 diff --git a/docs/qemu-qmp-ref.texi b/docs/qemu-qmp-ref.texi index 818e525..0a00569 100644 --- a/docs/qemu-qmp-ref.texi +++ b/docs/qemu-qmp-ref.texi @@ -1,6 +1,8 @@ \input texinfo @setfilename qemu-qmp-ref.info =20 +@include version.texi + @exampleindent 0 @paragraphindent 0 =20 --=20 2.7.4