From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55328) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6fWA-0004eN-C9 for qemu-devel@nongnu.org; Sun, 11 Mar 2012 05:56:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S6fW8-0007fg-Bg for qemu-devel@nongnu.org; Sun, 11 Mar 2012 05:56:45 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:50203) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6fW8-0007fa-3v for qemu-devel@nongnu.org; Sun, 11 Mar 2012 05:56:44 -0400 Message-ID: <4F5C76D9.6090004@msgid.tls.msk.ru> Date: Sun, 11 Mar 2012 13:56:41 +0400 From: Michael Tokarev MIME-Version: 1.0 References: <1328192202-23450-1-git-send-email-mjt@msgid.tls.msk.ru> In-Reply-To: <1328192202-23450-1-git-send-email-mjt@msgid.tls.msk.ru> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 1/2] Support @documentencoding in scripts/texi2pod.pl List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi Ping? It's been more than a month since this patch has been posted. Maybe it is a good candidate for -trivial queue? Thanks, /mjt On 02.02.2012 18:16, Michael Tokarev wrote: > Currently our texi2pod ignores @documentencoding even if it is set > properly in *.texi files. This results in a mojibake in documents > generated from qemu.pod (which is generated from qemu-doc.texi by > texi2pod), because the rest of the tools assumes ASCII encoding. > > This patch recognizes first @documentencoding in input and places > it at the beginning of output as =encoding directive. > > Signed-Off-By: Michael Tokarev > --- > scripts/texi2pod.pl | 9 +++++++++ > 1 files changed, 9 insertions(+), 0 deletions(-) > > diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl > index 9ed056a..94097fb 100755 > --- a/scripts/texi2pod.pl > +++ b/scripts/texi2pod.pl > @@ -36,6 +36,7 @@ $fnno = 1; > $inf = ""; > $ibase = ""; > @ipath = (); > +$encoding = undef; > > while ($_ = shift) { > if (/^-D(.*)$/) { > @@ -97,6 +98,12 @@ while(<$inf>) { > /^\@setfilename\s+([^.]+)/ and $fn = $1, next; > /^\@settitle\s+([^.]+)/ and $tl = postprocess($1), next; > > + # Look for document encoding > + /^\@documentencoding\s+([^.]+)/ and do { > + $encoding = $1 unless defined $encoding; > + next; > + }; > + > # Identify a man title but keep only the one we are interested in. > /^\@c\s+man\s+title\s+([A-Za-z0-9-]+)\s+(.+)/ and do { > if (exists $defs{$1}) { > @@ -336,6 +343,8 @@ $inf = pop @instack; > > die "No filename or title\n" unless defined $fn && defined $tl; > > +print "=encoding $encoding\n\n" if defined $encoding; > + > $sects{NAME} = "$fn \- $tl\n"; > $sects{FOOTNOTES} .= "=back\n" if exists $sects{FOOTNOTES}; >