[Ffmpeg-cvslog] CVS: ffmpeg/doc texi2pod.pl,1.2,1.3
Diego Biurrun CVS
diego
Thu Dec 22 02:10:38 CET 2005
- Previous message: [Ffmpeg-cvslog] CVS: ffmpeg/libavformat asf-enc.c, 1.74, 1.75 asf.c, 1.88, 1.89 asf.h, 1.67, 1.68 audio.c, 1.26, 1.27 avformat.h, 1.136, 1.137 avi.h, 1.16, 1.17 avidec.c, 1.77, 1.78 avienc.c, 1.116, 1.117 aviobuf.c, 1.32, 1.33 barpainet.c, 1.2, 1.3 cutils.c, 1.7, 1.8 dc1394.c, 1.5, 1.6 dv.c, 1.47, 1.48 dv1394.c, 1.17, 1.18 dv1394.h, 1.5, 1.6 ffm.c, 1.47, 1.48 flvdec.c, 1.23, 1.24 flvenc.c, 1.20, 1.21 gif.c, 1.21, 1.22 gifdec.c, 1.10, 1.11 grab.c, 1.38, 1.39 matroska.c, 1.18, 1.19 mov.c, 1.95, 1.96 movenc.c, 1.45, 1.46 mpegtsenc.c, 1.10, 1.11 nsvdec.c, 1.12, 1.13 nut.c, 1.58, 1.59 ogg.c, 1.28, 1.29 ogg2.c, 1.12, 1.13 oggparsetheora.c, 1.4, 1.5 raw.c, 1.60, 1.61 rm.c, 1.53, 1.54 rtpproto.c, 1.10, 1.11 rtsp.c, 1.24, 1.25 sierravmd.c, 1.12, 1.13 swf.c, 1.30, 1.31 utils.c, 1.171, 1.172 wav.c, 1.57, 1.58 wc3movie.c, 1.13, 1.14 yuv4mpeg.c, 1.27, 1.28
- Next message: [Ffmpeg-cvslog] CVS: ffmpeg cmdutils.c, 1.10, 1.11 configure, 1.221, 1.222 cws2fws.c, 1.2, 1.3 ffmpeg.c, 1.357, 1.358 ffplay.c, 1.53, 1.54 ffserver.c, 1.102, 1.103
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/ffmpeg/ffmpeg/doc
In directory mail:/var2/tmp/cvs-serv29491/doc
Modified Files:
texi2pod.pl
Log Message:
COSMETICS: tabs --> spaces, some prettyprinting
Index: texi2pod.pl
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/doc/texi2pod.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- texi2pod.pl 17 Dec 2005 18:14:26 -0000 1.2
+++ texi2pod.pl 22 Dec 2005 01:10:05 -0000 1.3
@@ -39,24 +39,24 @@
while ($_ = shift) {
if (/^-D(.*)$/) {
- if ($1 ne "") {
- $flag = $1;
- } else {
- $flag = shift;
- }
- $value = "";
- ($flag, $value) = ($flag =~ /^([^=]+)(?:=(.+))?/);
- die "no flag specified for -D\n"
- unless $flag ne "";
- die "flags may only contain letters, digits, hyphens, dashes and underscores\n"
- unless $flag =~ /^[a-zA-Z0-9_-]+$/;
- $defs{$flag} = $value;
+ if ($1 ne "") {
+ $flag = $1;
+ } else {
+ $flag = shift;
+ }
+ $value = "";
+ ($flag, $value) = ($flag =~ /^([^=]+)(?:=(.+))?/);
+ die "no flag specified for -D\n"
+ unless $flag ne "";
+ die "flags may only contain letters, digits, hyphens, dashes and underscores\n"
+ unless $flag =~ /^[a-zA-Z0-9_-]+$/;
+ $defs{$flag} = $value;
} elsif (/^-/) {
- usage();
+ usage();
} else {
- $in = $_, next unless defined $in;
- $out = $_, next unless defined $out;
- usage();
+ $in = $_, next unless defined $in;
+ $out = $_, next unless defined $out;
+ usage();
}
}
@@ -76,13 +76,13 @@
while(<$inf>) {
# Certain commands are discarded without further processing.
/^\@(?:
- [a-z]+index # @*index: useful only in complete manual
- |need # @need: useful only in printed manual
- |(?:end\s+)?group # @group .. @end group: ditto
- |page # @page: ditto
- |node # @node: useful only in .info file
- |(?:end\s+)?ifnottex # @ifnottex .. @end ifnottex: use contents
- )\b/x and next;
+ [a-z]+index # @*index: useful only in complete manual
+ |need # @need: useful only in printed manual
+ |(?:end\s+)?group # @group .. @end group: ditto
+ |page # @page: ditto
+ |node # @node: useful only in .info file
+ |(?:end\s+)?ifnottex # @ifnottex .. @end ifnottex: use contents
+ )\b/x and next;
chomp;
@@ -92,38 +92,38 @@
# 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}) {
- $fn = $1;
- $tl = postprocess($2);
- }
- next;
+ if (exists $defs{$1}) {
+ $fn = $1;
+ $tl = postprocess($2);
+ }
+ next;
};
# Look for blocks surrounded by @c man begin SECTION ... @c man end.
# This really oughta be @ifman ... @end ifman and the like, but such
# would require rev'ing all other Texinfo translators.
/^\@c\s+man\s+begin\s+([A-Z]+)\s+([A-Za-z0-9-]+)/ and do {
- $output = 1 if exists $defs{$2};
+ $output = 1 if exists $defs{$2};
$sect = $1;
- next;
+ next;
};
/^\@c\s+man\s+begin\s+([A-Z]+)/ and $sect = $1, $output = 1, next;
/^\@c\s+man\s+end/ and do {
- $sects{$sect} = "" unless exists $sects{$sect};
- $sects{$sect} .= postprocess($section);
- $section = "";
- $output = 0;
- next;
+ $sects{$sect} = "" unless exists $sects{$sect};
+ $sects{$sect} .= postprocess($section);
+ $section = "";
+ $output = 0;
+ next;
};
# handle variables
/^\@set\s+([a-zA-Z0-9_-]+)\s*(.*)$/ and do {
- $defs{$1} = $2;
- next;
+ $defs{$1} = $2;
+ next;
};
/^\@clear\s+([a-zA-Z0-9_-]+)/ and do {
- delete $defs{$1};
- next;
+ delete $defs{$1};
+ next;
};
next unless $output;
@@ -135,55 +135,55 @@
# End-block handler goes up here because it needs to operate even
# if we are skipping.
/^\@end\s+([a-z]+)/ and do {
- # Ignore @end foo, where foo is not an operation which may
- # cause us to skip, if we are presently skipping.
- my $ended = $1;
- next if $skipping && $ended !~ /^(?:ifset|ifclear|ignore|menu|iftex)$/;
+ # Ignore @end foo, where foo is not an operation which may
+ # cause us to skip, if we are presently skipping.
+ my $ended = $1;
+ next if $skipping && $ended !~ /^(?:ifset|ifclear|ignore|menu|iftex)$/;
- die "\@end $ended without \@$ended at line $.\n" unless defined $endw;
- die "\@$endw ended by \@end $ended at line $.\n" unless $ended eq $endw;
+ die "\@end $ended without \@$ended at line $.\n" unless defined $endw;
+ die "\@$endw ended by \@end $ended at line $.\n" unless $ended eq $endw;
- $endw = pop @endwstack;
+ $endw = pop @endwstack;
- if ($ended =~ /^(?:ifset|ifclear|ignore|menu|iftex)$/) {
- $skipping = pop @skstack;
- next;
- } elsif ($ended =~ /^(?:example|smallexample|display)$/) {
- $shift = "";
- $_ = ""; # need a paragraph break
- } elsif ($ended =~ /^(?:itemize|enumerate|[fv]?table)$/) {
- $_ = "\n=back\n";
- $ic = pop @icstack;
- } else {
- die "unknown command \@end $ended at line $.\n";
- }
+ if ($ended =~ /^(?:ifset|ifclear|ignore|menu|iftex)$/) {
+ $skipping = pop @skstack;
+ next;
+ } elsif ($ended =~ /^(?:example|smallexample|display)$/) {
+ $shift = "";
+ $_ = ""; # need a paragraph break
+ } elsif ($ended =~ /^(?:itemize|enumerate|[fv]?table)$/) {
+ $_ = "\n=back\n";
+ $ic = pop @icstack;
+ } else {
+ die "unknown command \@end $ended at line $.\n";
+ }
};
# We must handle commands which can cause skipping even while we
# are skipping, otherwise we will not process nested conditionals
# correctly.
/^\@ifset\s+([a-zA-Z0-9_-]+)/ and do {
- push @endwstack, $endw;
- push @skstack, $skipping;
- $endw = "ifset";
- $skipping = 1 unless exists $defs{$1};
- next;
+ push @endwstack, $endw;
+ push @skstack, $skipping;
+ $endw = "ifset";
+ $skipping = 1 unless exists $defs{$1};
+ next;
};
/^\@ifclear\s+([a-zA-Z0-9_-]+)/ and do {
- push @endwstack, $endw;
- push @skstack, $skipping;
- $endw = "ifclear";
- $skipping = 1 if exists $defs{$1};
- next;
+ push @endwstack, $endw;
+ push @skstack, $skipping;
+ $endw = "ifclear";
+ $skipping = 1 if exists $defs{$1};
+ next;
};
/^\@(ignore|menu|iftex)\b/ and do {
- push @endwstack, $endw;
- push @skstack, $skipping;
- $endw = $1;
- $skipping = 1;
- next;
+ push @endwstack, $endw;
+ push @skstack, $skipping;
+ $endw = $1;
+ $skipping = 1;
+ next;
};
next if $skipping;
@@ -210,85 +210,85 @@
# Inside a verbatim block, handle @var specially.
if ($shift ne "") {
- s/\@var\{([^\}]*)\}/<$1>/g;
+ s/\@var\{([^\}]*)\}/<$1>/g;
}
# POD doesn't interpret E<> inside a verbatim block.
if ($shift eq "") {
- s/</</g;
- s/>/>/g;
+ s/</</g;
+ s/>/>/g;
} else {
- s/</</g;
- s/>/>/g;
+ s/</</g;
+ s/>/>/g;
}
# Single line command handlers.
/^\@include\s+(.+)$/ and do {
- push @instack, $inf;
- $inf = gensym();
+ push @instack, $inf;
+ $inf = gensym();
- # Try cwd and $ibase.
- open($inf, "<" . $1)
- or open($inf, "<" . $ibase . "/" . $1)
- or die "cannot open $1 or $ibase/$1: $!\n";
- next;
+ # Try cwd and $ibase.
+ open($inf, "<" . $1)
+ or open($inf, "<" . $ibase . "/" . $1)
+ or die "cannot open $1 or $ibase/$1: $!\n";
+ next;
};
/^\@(?:section|unnumbered|unnumberedsec|center)\s+(.+)$/
- and $_ = "\n=head2 $1\n";
+ and $_ = "\n=head2 $1\n";
/^\@subsection\s+(.+)$/
- and $_ = "\n=head3 $1\n";
+ and $_ = "\n=head3 $1\n";
# Block command handlers:
/^\@itemize\s+(\@[a-z]+|\*|-)/ and do {
- push @endwstack, $endw;
- push @icstack, $ic;
- $ic = $1;
- $_ = "\n=over 4\n";
- $endw = "itemize";
+ push @endwstack, $endw;
+ push @icstack, $ic;
+ $ic = $1;
+ $_ = "\n=over 4\n";
+ $endw = "itemize";
};
/^\@enumerate(?:\s+([a-zA-Z0-9]+))?/ and do {
- push @endwstack, $endw;
- push @icstack, $ic;
- if (defined $1) {
- $ic = $1 . ".";
- } else {
- $ic = "1.";
- }
- $_ = "\n=over 4\n";
- $endw = "enumerate";
+ push @endwstack, $endw;
+ push @icstack, $ic;
+ if (defined $1) {
+ $ic = $1 . ".";
+ } else {
+ $ic = "1.";
+ }
+ $_ = "\n=over 4\n";
+ $endw = "enumerate";
};
/^\@([fv]?table)\s+(\@[a-z]+)/ and do {
- push @endwstack, $endw;
- push @icstack, $ic;
- $endw = $1;
- $ic = $2;
- $ic =~ s/\@(?:samp|strong|key|gcctabopt|option|env)/B/;
- $ic =~ s/\@(?:code|kbd)/C/;
- $ic =~ s/\@(?:dfn|var|emph|cite|i)/I/;
- $ic =~ s/\@(?:file)/F/;
- $_ = "\n=over 4\n";
+ push @endwstack, $endw;
+ push @icstack, $ic;
+ $endw = $1;
+ $ic = $2;
+ $ic =~ s/\@(?:samp|strong|key|gcctabopt|option|env)/B/;
+ $ic =~ s/\@(?:code|kbd)/C/;
+ $ic =~ s/\@(?:dfn|var|emph|cite|i)/I/;
+ $ic =~ s/\@(?:file)/F/;
+ $_ = "\n=over 4\n";
};
/^\@((?:small)?example|display)/ and do {
- push @endwstack, $endw;
- $endw = $1;
- $shift = "\t";
- $_ = ""; # need a paragraph break
+ push @endwstack, $endw;
+ $endw = $1;
+ $shift = "\t";
+ $_ = ""; # need a paragraph break
};
/^\@itemx?\s*(.+)?$/ and do {
- if (defined $1) {
- # Entity escapes prevent munging by the <> processing below.
- $_ = "\n=item $ic\<$1\>\n";
- } else {
- $_ = "\n=item $ic\n";
- $ic =~ y/A-Ya-y/B-Zb-z/;
- $ic =~ s/(\d+)/$1 + 1/eg;
- }
+ if (defined $1) {
+ # Entity escapes prevent munging by the <> processing below.
+ $_ = "\n=item $ic\<$1\>\n";
+ } else {
+ $_ = "\n=item $ic\n";
+ $ic =~ y/A-Ya-y/B-Zb-z/;
+ $ic =~ s/(\d+)/$1 + 1/eg;
+ }
};
$section .= $shift.$_."\n";
@@ -304,13 +304,13 @@
$sects{FOOTNOTES} .= "=back\n" if exists $sects{FOOTNOTES};
for $sect (qw(NAME SYNOPSIS DESCRIPTION OPTIONS EXAMPLES ENVIRONMENT FILES
- BUGS NOTES FOOTNOTES SEEALSO AUTHOR COPYRIGHT)) {
+ BUGS NOTES FOOTNOTES SEEALSO AUTHOR COPYRIGHT)) {
if(exists $sects{$sect}) {
- $head = $sect;
- $head =~ s/SEEALSO/SEE ALSO/;
- print "=head1 $head\n\n";
- print scalar unmunge ($sects{$sect});
- print "\n";
+ $head = $sect;
+ $head =~ s/SEEALSO/SEE ALSO/;
+ print "=head1 $head\n\n";
+ print scalar unmunge ($sects{$sect});
+ print "\n";
}
}
@@ -325,13 +325,13 @@
# @value{foo} is replaced by whatever 'foo' is defined as.
while (m/(\@value\{([a-zA-Z0-9_-]+)\})/g) {
- if (! exists $defs{$2}) {
- print STDERR "Option $2 not defined\n";
- s/\Q$1\E//;
- } else {
- $value = $defs{$2};
- s/\Q$1\E/$value/;
- }
+ if (! exists $defs{$2}) {
+ print STDERR "Option $2 not defined\n";
+ s/\Q$1\E//;
+ } else {
+ $value = $defs{$2};
+ s/\Q$1\E/$value/;
+ }
}
# Formatting commands.
@@ -381,9 +381,9 @@
# processing because otherwise the regexp will choke on formatting
# inside @footnote.
while (/\@footnote/g) {
- s/\@footnote\{([^\}]+)\}/[$fnno]/;
- add_footnote($1, $fnno);
- $fnno++;
+ s/\@footnote\{([^\}]+)\}/[$fnno]/;
+ add_footnote($1, $fnno);
+ $fnno++;
}
return $_;
@@ -406,7 +406,7 @@
sub add_footnote
{
unless (exists $sects{FOOTNOTES}) {
- $sects{FOOTNOTES} = "\n=over 4\n\n";
+ $sects{FOOTNOTES} = "\n=over 4\n\n";
}
$sects{FOOTNOTES} .= "=item $fnno.\n\n"; $fnno++;
@@ -419,9 +419,9 @@
my $genseq = 0;
sub gensym
{
- my $name = "GEN" . $genseq++;
- my $ref = \*{$name};
- delete $::{$name};
- return $ref;
+ my $name = "GEN" . $genseq++;
+ my $ref = \*{$name};
+ delete $::{$name};
+ return $ref;
}
}
- Previous message: [Ffmpeg-cvslog] CVS: ffmpeg/libavformat asf-enc.c, 1.74, 1.75 asf.c, 1.88, 1.89 asf.h, 1.67, 1.68 audio.c, 1.26, 1.27 avformat.h, 1.136, 1.137 avi.h, 1.16, 1.17 avidec.c, 1.77, 1.78 avienc.c, 1.116, 1.117 aviobuf.c, 1.32, 1.33 barpainet.c, 1.2, 1.3 cutils.c, 1.7, 1.8 dc1394.c, 1.5, 1.6 dv.c, 1.47, 1.48 dv1394.c, 1.17, 1.18 dv1394.h, 1.5, 1.6 ffm.c, 1.47, 1.48 flvdec.c, 1.23, 1.24 flvenc.c, 1.20, 1.21 gif.c, 1.21, 1.22 gifdec.c, 1.10, 1.11 grab.c, 1.38, 1.39 matroska.c, 1.18, 1.19 mov.c, 1.95, 1.96 movenc.c, 1.45, 1.46 mpegtsenc.c, 1.10, 1.11 nsvdec.c, 1.12, 1.13 nut.c, 1.58, 1.59 ogg.c, 1.28, 1.29 ogg2.c, 1.12, 1.13 oggparsetheora.c, 1.4, 1.5 raw.c, 1.60, 1.61 rm.c, 1.53, 1.54 rtpproto.c, 1.10, 1.11 rtsp.c, 1.24, 1.25 sierravmd.c, 1.12, 1.13 swf.c, 1.30, 1.31 utils.c, 1.171, 1.172 wav.c, 1.57, 1.58 wc3movie.c, 1.13, 1.14 yuv4mpeg.c, 1.27, 1.28
- Next message: [Ffmpeg-cvslog] CVS: ffmpeg cmdutils.c, 1.10, 1.11 configure, 1.221, 1.222 cws2fws.c, 1.2, 1.3 ffmpeg.c, 1.357, 1.358 ffplay.c, 1.53, 1.54 ffserver.c, 1.102, 1.103
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the ffmpeg-cvslog
mailing list