[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 03/33] texi2pod: parse @include directives outside "@c man" bl
From: |
Peter Maydell |
Subject: |
[PATCH v3 03/33] texi2pod: parse @include directives outside "@c man" blocks |
Date: |
Fri, 28 Feb 2020 15:35:49 +0000 |
From: Paolo Bonzini <address@hidden>
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 <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
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;
};
+ # Single line command handlers.
+
+ /^\@include\s+(.+)$/ and do {
+ push @instack, $inf;
+ $inf = gensym();
+ $file = postprocess($1);
+
+ # Try cwd and $ibase, then explicit -I paths.
+ $done = 0;
+ foreach $path ("", $ibase, @ipath) {
+ $mypath = $file;
+ $mypath = $path . "/" . $mypath if ($path ne "");
+ open($inf, "<" . $mypath) and ($done = 1, last);
+ }
+ die "cannot find $file" if !$done;
+ next;
+ };
+
next unless $output;
# Discard comments. (Can't do it above, because then we'd never see
@@ -242,24 +260,6 @@ while(<$inf>) {
s/>/>/g;
}
- # Single line command handlers.
-
- /^\@include\s+(.+)$/ and do {
- push @instack, $inf;
- $inf = gensym();
- $file = postprocess($1);
-
- # Try cwd and $ibase, then explicit -I paths.
- $done = 0;
- foreach $path ("", $ibase, @ipath) {
- $mypath = $file;
- $mypath = $path . "/" . $mypath if ($path ne "");
- open($inf, "<" . $mypath) and ($done = 1, last);
- }
- die "cannot find $file" if !$done;
- next;
- };
-
/^\@(?:section|unnumbered|unnumberedsec|center)\s+(.+)$/
and $_ = "\n=head2 $1\n";
/^\@subsection\s+(.+)$/
--
2.20.1
- [PATCH v3 00/33] Convert qemu-doc to rST, Peter Maydell, 2020/02/28
- [PATCH v3 02/33] qemu-doc: remove target OS documentation, Peter Maydell, 2020/02/28
- [PATCH v3 03/33] texi2pod: parse @include directives outside "@c man" blocks,
Peter Maydell <=
- [PATCH v3 01/33] qemu-doc: convert user-mode emulation to a separate Sphinx manual, Peter Maydell, 2020/02/28
- [PATCH v3 06/33] qemu-doc: extract common system emulator documentation from the PC section, Peter Maydell, 2020/02/28
- [PATCH v3 07/33] qemu-doc: move system requirements chapter inside PC section, Peter Maydell, 2020/02/28
- [PATCH v3 04/33] qemu-doc: split CPU models doc between MIPS and x86 parts, Peter Maydell, 2020/02/28
- [PATCH v3 15/33] docs/system: Convert qemu-cpu-models.texi to rST, Peter Maydell, 2020/02/28
- [PATCH v3 10/33] qemu-doc: move qemu-tech.texi into main section, Peter Maydell, 2020/02/28
- [PATCH v3 11/33] qemu-doc: move included files to docs/system, Peter Maydell, 2020/02/28
- [PATCH v3 12/33] qemu-doc: remove indices other than findex, Peter Maydell, 2020/02/28
- [PATCH v3 14/33] docs: Create defs.rst.inc as a place to define substitutions, Peter Maydell, 2020/02/28
- [PATCH v3 17/33] docs/system: convert managed startup to rST., Peter Maydell, 2020/02/28