From nobody Thu Nov 13 22:12:00 2025 Delivered-To: importer@patchew.org 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; 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1582904266; cv=none; d=zohomail.com; s=zohoarc; b=ndCwEFHj3QI7FDQdHwN0dX3Grg71jlqGaVNO29XU5raozNUpEPKhgrXsKIQfOQdXvVRMzh7MwVx7yNAU7F8S3jiRcxav35lh/hvTWGa3lBoVld3gUebOLlvzh7XQIBPPXclpZF0muCH0mHv4HhEscPWja2Z2DUbVfL2Nk8Ei2e0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582904266; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=X9wpHhfsmd3rtWtGyuUFtQWdHkR1Efjq12YGQ0CRiO0=; b=jz8WQXjDc+vrNyCkuVof5OzF1s9WyzSox9rbRUwOFSrjugz58x+ucP9ojJ75ld1HN7viAh/zKXzOjE0efKovYpggzUiTy/kCvhy3u2S20QZAJ0t0ARozHhjySAk9yp2lQnostlUY0EL2ZhlI3lVylpYr63I4UMBmP5mkVMZiuFU= 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=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582904266907724.5225401283958; Fri, 28 Feb 2020 07:37:46 -0800 (PST) Received: from localhost ([::1]:48648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7hhx-0002G1-Ox for importer@patchew.org; Fri, 28 Feb 2020 10:37:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46675) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7hgi-0000Q9-TM for qemu-devel@nongnu.org; Fri, 28 Feb 2020 10:36:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j7hgh-0004j5-SO for qemu-devel@nongnu.org; Fri, 28 Feb 2020 10:36:28 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:43918) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j7hgh-0004ij-Mg for qemu-devel@nongnu.org; Fri, 28 Feb 2020 10:36:27 -0500 Received: by mail-wr1-x434.google.com with SMTP id e10so1986074wrr.10 for ; Fri, 28 Feb 2020 07:36:27 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id u23sm2659452wmu.14.2020.02.28.07.36.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2020 07:36:25 -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=X9wpHhfsmd3rtWtGyuUFtQWdHkR1Efjq12YGQ0CRiO0=; b=tNq2eDb4/yiKo9z5RVP+ghnGiN8+g+vgqXx7ky+92wzEJkCYH097uUxpSLr0VBs+61 DobwisvygUpUxwd5ICGnJPZ7oR/vc4qlcSMpQQBBhxesydll7qsN8m3+WBWDd6dAVexJ 7GRWWaX8gFwT4mIc68+p/NTyPU+dO3M8U1Pm2yVX4kxU8zPKyoo8fD2r+SZGXsmATJPq 8X/dShGxe73ATnbang1JXnzTJQXoG+9pdSaYjk4l28deSVfRY0tGas99N8COquOg4FCD VBXzAgd3y0ijAuU8fUUVK8JguobaNa/PjsIYkVJxupNLZ0ZXE8dmI0mQXIkQOrQUS1OA 1Whg== 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=X9wpHhfsmd3rtWtGyuUFtQWdHkR1Efjq12YGQ0CRiO0=; b=SxKg1lHtHtKCwzdqrLY2dqzoKzzwTCYuTTaOQ+4qlyZn0GHN0rHdihyqmteFUOdjh0 Sm1zEctXqlRS0RWzg7PJGmo1NCyYky3tVAGJ/2QLF/SDsNhUQwGA/onLwiCo4ca8Ucr+ ty7NaZ4dvDxpQnAwtVvIXYsR2IW9dROoWZBBALvC8inEVyLbNtUYMtfMbj1rS/gkPZJ1 VGJoQ8B48xlsl0VafIhOyIQ1FrQBXWpFhsrHWZR2X34OcaMj9Z9exbBsVOoaTip/Oc8B vb1H1ewQRMRTuS21gX+yI1EE5XDAC5o09PBop5cpuB0PIW3bVAqTYoZSAg2FOVLNcSgk 4rQQ== X-Gm-Message-State: APjAAAVLdDUjDouHKc9LkeSZHY+d0VxREh9v+H2HgdStw/eM8wnT9H1a f/FAUM+XL84SzFDT3EPQ/4aaW4vlHZ9Vtw== X-Google-Smtp-Source: APXvYqw4CpHUacn2f1h1tQVgEz80EpwoX5b/jAqnxyIXRXrqmrZN09/icgQXYcUPh0Hspk2CEhYwKQ== X-Received: by 2002:a5d:4b01:: with SMTP id v1mr5229902wrq.422.1582904186264; Fri, 28 Feb 2020 07:36:26 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH v3 03/33] texi2pod: parse @include directives outside "@c man" blocks Date: Fri, 28 Feb 2020 15:35:49 +0000 Message-Id: <20200228153619.9906-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200228153619.9906-1-peter.maydell@linaro.org> References: <20200228153619.9906-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 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: Paolo Bonzini , Kashyap Chamarthy Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini This enables splitting the huge qemu-doc.texi file and keeping parallel Texinfo and rST versions of the documentation. texi2pod is not going to live much longer and hardly anyone cares about its upstream status, so the temporary fork should be acceptable. Signed-off-by: Paolo Bonzini Message-id: 20200226113034.6741-4-pbonzini@redhat.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell Reviewed-by: Alex Benn=C3=A9e --- scripts/texi2pod.pl | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl index 839b7917cf7..8bfc6f6f4c4 100755 --- a/scripts/texi2pod.pl +++ b/scripts/texi2pod.pl @@ -143,6 +143,24 @@ while(<$inf>) { next; }; =20 + # Single line command handlers. + + /^\@include\s+(.+)$/ and do { + push @instack, $inf; + $inf =3D gensym(); + $file =3D postprocess($1); + + # Try cwd and $ibase, then explicit -I paths. + $done =3D 0; + foreach $path ("", $ibase, @ipath) { + $mypath =3D $file; + $mypath =3D $path . "/" . $mypath if ($path ne ""); + open($inf, "<" . $mypath) and ($done =3D 1, last); + } + die "cannot find $file" if !$done; + next; + }; + next unless $output; =20 # Discard comments. (Can't do it above, because then we'd never see @@ -242,24 +260,6 @@ while(<$inf>) { s/>/>/g; } =20 - # Single line command handlers. - - /^\@include\s+(.+)$/ and do { - push @instack, $inf; - $inf =3D gensym(); - $file =3D postprocess($1); - - # Try cwd and $ibase, then explicit -I paths. - $done =3D 0; - foreach $path ("", $ibase, @ipath) { - $mypath =3D $file; - $mypath =3D $path . "/" . $mypath if ($path ne ""); - open($inf, "<" . $mypath) and ($done =3D 1, last); - } - die "cannot find $file" if !$done; - next; - }; - /^\@(?:section|unnumbered|unnumberedsec|center)\s+(.+)$/ and $_ =3D "\n=3Dhead2 $1\n"; /^\@subsection\s+(.+)$/ --=20 2.20.1