Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
external
ffmpeg
Commits
bb270c08
Commit
bb270c08
authored
Dec 22, 2005
by
Diego Biurrun
Browse files
COSMETICS: tabs --> spaces, some prettyprinting
Originally committed as revision 4764 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
50827fcf
Changes
178
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
723 additions
and
723 deletions
+723
-723
cmdutils.c
cmdutils.c
+3
-3
configure
configure
+87
-87
cws2fws.c
cws2fws.c
+42
-42
doc/texi2pod.pl
doc/texi2pod.pl
+147
-147
ffmpeg.c
ffmpeg.c
+36
-36
ffplay.c
ffplay.c
+23
-23
ffserver.c
ffserver.c
+22
-22
libavcodec/8bps.c
libavcodec/8bps.c
+135
-135
libavcodec/a52dec.c
libavcodec/a52dec.c
+20
-20
libavcodec/ac3dec.c
libavcodec/ac3dec.c
+16
-16
libavcodec/ac3enc.c
libavcodec/ac3enc.c
+40
-40
libavcodec/adpcm.c
libavcodec/adpcm.c
+91
-91
libavcodec/allcodecs.c
libavcodec/allcodecs.c
+1
-1
libavcodec/alpha/asm.h
libavcodec/alpha/asm.h
+34
-34
libavcodec/alpha/dsputil_alpha_asm.S
libavcodec/alpha/dsputil_alpha_asm.S
+12
-12
libavcodec/alpha/motion_est_alpha.c
libavcodec/alpha/motion_est_alpha.c
+1
-1
libavcodec/alpha/simple_idct_alpha.c
libavcodec/alpha/simple_idct_alpha.c
+1
-1
libavcodec/amr.c
libavcodec/amr.c
+3
-3
libavcodec/armv4l/dsputil_arm.c
libavcodec/armv4l/dsputil_arm.c
+5
-5
libavcodec/armv4l/dsputil_iwmmxt.c
libavcodec/armv4l/dsputil_iwmmxt.c
+4
-4
No files found.
cmdutils.c
View file @
bb270c08
...
...
@@ -96,7 +96,7 @@ unknown_opt:
if
(
po
->
u
.
func2_arg
(
opt
+
1
,
arg
)
<
0
)
goto
unknown_opt
;
}
else
{
po
->
u
.
func_arg
(
arg
);
po
->
u
.
func_arg
(
arg
);
}
}
else
{
parse_arg_file
(
opt
);
...
...
@@ -122,8 +122,8 @@ void print_error(const char *filename, int err)
break
;
case
AVERROR_IO
:
fprintf
(
stderr
,
"%s: I/O error occured
\n
"
"Usually that means that input file is truncated and/or corrupted.
\n
"
,
filename
);
"Usually that means that input file is truncated and/or corrupted.
\n
"
,
filename
);
break
;
case
AVERROR_NOMEM
:
fprintf
(
stderr
,
"%s: memory allocation error occured
\n
"
,
filename
);
...
...
configure
View file @
bb270c08
...
...
@@ -688,26 +688,26 @@ fi
needmdynamicnopic
=
"no"
if
test
$targetos
=
Darwin
;
then
if
test
-n
"
`
$cc
-v
2>&1 |
grep
xlc
`
"
;
then
CFLAGS
=
"
$CFLAGS
-qpdf2 -qlanglvl=extc99 -qmaxmem=-1 -qarch=auto -qtune=auto"
CFLAGS
=
"
$CFLAGS
-qpdf2 -qlanglvl=extc99 -qmaxmem=-1 -qarch=auto -qtune=auto"
else
gcc_version
=
"
`
$cc
-v
2>&1 |
grep
version |
cut
-d
' '
-f3-
`
"
case
"
$gcc_version
"
in
*
2.95
*
)
CFLAGS
=
"
$CFLAGS
-no-cpp-precomp -pipe -fomit-frame-pointer"
;;
*
[
34].
*
)
CFLAGS
=
"
$CFLAGS
-no-cpp-precomp -pipe -fomit-frame-pointer -force_cpusubtype_ALL -Wno-sign-compare"
if
test
"
$lshared
"
=
no
;
then
needmdynamicnopic
=
"yes"
fi
;;
*
)
CFLAGS
=
"
$CFLAGS
-no-cpp-precomp -pipe -fomit-frame-pointer"
if
test
"
$lshared
"
=
no
;
then
needmdynamicnopic
=
"yes"
fi
;;
esac
gcc_version
=
"
`
$cc
-v
2>&1 |
grep
version |
cut
-d
' '
-f3-
`
"
case
"
$gcc_version
"
in
*
2.95
*
)
CFLAGS
=
"
$CFLAGS
-no-cpp-precomp -pipe -fomit-frame-pointer"
;;
*
[
34].
*
)
CFLAGS
=
"
$CFLAGS
-no-cpp-precomp -pipe -fomit-frame-pointer -force_cpusubtype_ALL -Wno-sign-compare"
if
test
"
$lshared
"
=
no
;
then
needmdynamicnopic
=
"yes"
fi
;;
*
)
CFLAGS
=
"
$CFLAGS
-no-cpp-precomp -pipe -fomit-frame-pointer"
if
test
"
$lshared
"
=
no
;
then
needmdynamicnopic
=
"yes"
fi
;;
esac
fi
fi
...
...
@@ -725,62 +725,62 @@ TUNECPU="generic"
POWERPCMODE
=
"32bits"
if
test
$tune
!=
"generic"
;
then
case
$tune
in
601|ppc601|PowerPC601
)
CFLAGS
=
"
$CFLAGS
-mcpu=601"
if
test
$altivec
=
"yes"
;
then
echo
"WARNING: Tuning for PPC601 but AltiVec enabled!"
;
fi
TUNECPU
=
ppc601
;;
603
*
|
ppc603
*
|
PowerPC603
*
)
CFLAGS
=
"
$CFLAGS
-mcpu=603"
if
test
$altivec
=
"yes"
;
then
echo
"WARNING: Tuning for PPC603 but AltiVec enabled!"
;
fi
TUNECPU
=
ppc603
;;
604
*
|
ppc604
*
|
PowerPC604
*
)
CFLAGS
=
"
$CFLAGS
-mcpu=604"
if
test
$altivec
=
"yes"
;
then
echo
"WARNING: Tuning for PPC604 but AltiVec enabled!"
;
fi
TUNECPU
=
ppc604
;;
G3|g3|75
*
|
ppc75
*
|
PowerPC75
*
)
CFLAGS
=
"
$CFLAGS
-mcpu=750 -mtune=750 -mpowerpc-gfxopt"
if
test
$altivec
=
"yes"
;
then
echo
"WARNING: Tuning for PPC75x but AltiVec enabled!"
;
fi
TUNECPU
=
ppc750
;;
G4|g4|745
*
|
ppc745
*
|
PowerPC745
*
)
CFLAGS
=
"
$CFLAGS
-mcpu=7450 -mtune=7450 -mpowerpc-gfxopt"
if
test
$altivec
=
"no"
;
then
echo
"WARNING: Tuning for PPC745x but AltiVec disabled!"
;
fi
TUNECPU
=
ppc7450
;;
74
*
|
ppc74
*
|
PowerPC74
*
)
CFLAGS
=
"
$CFLAGS
-mcpu=7400 -mtune=7400 -mpowerpc-gfxopt"
if
test
$altivec
=
"no"
;
then
echo
"WARNING: Tuning for PPC74xx but AltiVec disabled!"
;
fi
TUNECPU
=
ppc7400
;;
G5|g5|970|ppc970|PowerPC970|power4
*
|
Power4
*
)
CFLAGS
=
"
$CFLAGS
-mcpu=970 -mtune=970 -mpowerpc-gfxopt -mpowerpc64"
if
test
$altivec
=
"no"
;
then
echo
"WARNING: Tuning for PPC970 but AltiVec disabled!"
;
fi
TUNECPU
=
ppc970
601|ppc601|PowerPC601
)
CFLAGS
=
"
$CFLAGS
-mcpu=601"
if
test
$altivec
=
"yes"
;
then
echo
"WARNING: Tuning for PPC601 but AltiVec enabled!"
;
fi
TUNECPU
=
ppc601
;;
603
*
|
ppc603
*
|
PowerPC603
*
)
CFLAGS
=
"
$CFLAGS
-mcpu=603"
if
test
$altivec
=
"yes"
;
then
echo
"WARNING: Tuning for PPC603 but AltiVec enabled!"
;
fi
TUNECPU
=
ppc603
;;
604
*
|
ppc604
*
|
PowerPC604
*
)
CFLAGS
=
"
$CFLAGS
-mcpu=604"
if
test
$altivec
=
"yes"
;
then
echo
"WARNING: Tuning for PPC604 but AltiVec enabled!"
;
fi
TUNECPU
=
ppc604
;;
G3|g3|75
*
|
ppc75
*
|
PowerPC75
*
)
CFLAGS
=
"
$CFLAGS
-mcpu=750 -mtune=750 -mpowerpc-gfxopt"
if
test
$altivec
=
"yes"
;
then
echo
"WARNING: Tuning for PPC75x but AltiVec enabled!"
;
fi
TUNECPU
=
ppc750
;;
G4|g4|745
*
|
ppc745
*
|
PowerPC745
*
)
CFLAGS
=
"
$CFLAGS
-mcpu=7450 -mtune=7450 -mpowerpc-gfxopt"
if
test
$altivec
=
"no"
;
then
echo
"WARNING: Tuning for PPC745x but AltiVec disabled!"
;
fi
TUNECPU
=
ppc7450
;;
74
*
|
ppc74
*
|
PowerPC74
*
)
CFLAGS
=
"
$CFLAGS
-mcpu=7400 -mtune=7400 -mpowerpc-gfxopt"
if
test
$altivec
=
"no"
;
then
echo
"WARNING: Tuning for PPC74xx but AltiVec disabled!"
;
fi
TUNECPU
=
ppc7400
;;
G5|g5|970|ppc970|PowerPC970|power4
*
|
Power4
*
)
CFLAGS
=
"
$CFLAGS
-mcpu=970 -mtune=970 -mpowerpc-gfxopt -mpowerpc64"
if
test
$altivec
=
"no"
;
then
echo
"WARNING: Tuning for PPC970 but AltiVec disabled!"
;
fi
TUNECPU
=
ppc970
POWERPCMODE
=
"64bits"
;;
i[3456]86|pentium|pentiumpro|pentium-mmx|pentium[234]|prescott|k6|k6-[23]|athlon|athlon-tbird|athlon-4|athlon-[mx]p|winchip-c6|winchip2|c3|nocona|athlon64|k8|opteron|athlon-fx
)
CFLAGS
=
"
$CFLAGS
-march=
$tune
"
;;
*
)
echo
"WARNING: Unknown CPU
\"
$tune
\"
, ignored."
;;
;;
i[3456]86|pentium|pentiumpro|pentium-mmx|pentium[234]|prescott|k6|k6-[23]|athlon|athlon-tbird|athlon-4|athlon-[mx]p|winchip-c6|winchip2|c3|nocona|athlon64|k8|opteron|athlon-fx
)
CFLAGS
=
"
$CFLAGS
-march=
$tune
"
;;
*
)
echo
"WARNING: Unknown CPU
\"
$tune
\"
, ignored."
;;
esac
fi
...
...
@@ -876,8 +876,8 @@ if test -z "$cross_prefix" ; then
cat
>
$TMPC
<<
EOF
#include <inttypes.h>
int main(int argc, char ** argv){
volatile uint32_t i=0x01234567;
return (*((uint8_t*)(&i))) == 0x67;
volatile uint32_t i=0x01234567;
return (*((uint8_t*)(&i))) == 0x67;
}
EOF
...
...
@@ -912,8 +912,8 @@ $cc -o $TMPE $TMPC 2>/dev/null || inttypes="no"
cat
>
$TMPC
<<
EOF
#include <inttypes.h>
int main(int argc, char ** argv){
volatile uint_fast64_t i=0x01234567;
return 0;
volatile uint_fast64_t i=0x01234567;
return 0;
}
EOF
...
...
@@ -1152,10 +1152,10 @@ fi
case
"
`
$cc
-v
2>&1 |
grep
version
`
"
in
*
gcc
*
)
CFLAGS
=
"-Wall -Wno-switch
$CFLAGS
"
;;
CFLAGS
=
"-Wall -Wno-switch
$CFLAGS
"
;;
*
)
;;
;;
esac
if
test
"
$sdl
"
=
"no"
;
then
...
...
@@ -1163,7 +1163,7 @@ if test "$sdl" = "no" ; then
fi
if
test
"
$debug
"
=
"yes"
;
then
CFLAGS
=
"-g
$CFLAGS
"
CFLAGS
=
"-g
$CFLAGS
"
fi
if
test
"
$optimize
"
=
"small"
;
then
...
...
@@ -1173,10 +1173,10 @@ fi
if
test
"
$optimize
"
=
"yes"
;
then
if
test
-n
"
`
$cc
-v
2>&1 |
grep
xlc
`
"
;
then
CFLAGS
=
"
$CFLAGS
-O5"
LDFLAGS
=
"
$LDFLAGS
-O5"
CFLAGS
=
"
$CFLAGS
-O5"
LDFLAGS
=
"
$LDFLAGS
-O5"
else
CFLAGS
=
"-O3
$CFLAGS
"
CFLAGS
=
"-O3
$CFLAGS
"
fi
fi
...
...
@@ -1793,9 +1793,9 @@ done
diff $TMPH config.h >/dev/null 2>&1
if test $? -ne 0 ; then
mv -f $TMPH config.h
mv -f $TMPH config.h
else
echo "config.h is unchanged"
echo "config.h is unchanged"
fi
rm -f $TMPO $TMPC $TMPE $TMPS $TMPH
...
...
cws2fws.c
View file @
bb270c08
...
...
@@ -25,37 +25,37 @@ main(int argc, char *argv[])
if
(
argc
<
3
)
{
printf
(
"Usage: %s <infile.swf> <outfile.swf>
\n
"
,
argv
[
0
]);
exit
(
1
);
printf
(
"Usage: %s <infile.swf> <outfile.swf>
\n
"
,
argv
[
0
]);
exit
(
1
);
}
fd_in
=
open
(
argv
[
1
],
O_RDONLY
);
if
(
fd_in
<
0
)
{
perror
(
"Error while opening: "
);
exit
(
1
);
perror
(
"Error while opening: "
);
exit
(
1
);
}
fd_out
=
open
(
argv
[
2
],
O_WRONLY
|
O_CREAT
,
00644
);
if
(
fd_out
<
0
)
{
perror
(
"Error while opening: "
);
close
(
fd_in
);
exit
(
1
);
perror
(
"Error while opening: "
);
close
(
fd_in
);
exit
(
1
);
}
if
(
read
(
fd_in
,
&
buf_in
,
8
)
!=
8
)
{
printf
(
"Header error
\n
"
);
close
(
fd_in
);
close
(
fd_out
);
exit
(
1
);
printf
(
"Header error
\n
"
);
close
(
fd_in
);
close
(
fd_out
);
exit
(
1
);
}
if
(
buf_in
[
0
]
!=
'C'
||
buf_in
[
1
]
!=
'W'
||
buf_in
[
2
]
!=
'S'
)
{
printf
(
"Not a compressed flash file
\n
"
);
exit
(
1
);
printf
(
"Not a compressed flash file
\n
"
);
exit
(
1
);
}
fstat
(
fd_in
,
&
statbuf
);
...
...
@@ -75,48 +75,48 @@ main(int argc, char *argv[])
for
(
i
=
0
;
i
<
comp_len
-
4
;)
{
int
ret
,
len
=
read
(
fd_in
,
&
buf_in
,
1024
);
int
ret
,
len
=
read
(
fd_in
,
&
buf_in
,
1024
);
dbgprintf
(
"read %d bytes
\n
"
,
len
);
dbgprintf
(
"read %d bytes
\n
"
,
len
);
last_out
=
zstream
.
total_out
;
last_out
=
zstream
.
total_out
;
zstream
.
next_in
=
&
buf_in
[
0
];
zstream
.
avail_in
=
len
;
zstream
.
next_out
=
&
buf_out
[
0
];
zstream
.
avail_out
=
1024
;
zstream
.
next_in
=
&
buf_in
[
0
];
zstream
.
avail_in
=
len
;
zstream
.
next_out
=
&
buf_out
[
0
];
zstream
.
avail_out
=
1024
;
ret
=
inflate
(
&
zstream
,
Z_SYNC_FLUSH
);
if
(
ret
==
Z_STREAM_END
||
ret
==
Z_BUF_ERROR
)
break
;
if
(
ret
!=
Z_OK
)
{
printf
(
"Error while decompressing: %d
\n
"
,
ret
);
inflateEnd
(
&
zstream
);
exit
(
1
);
}
ret
=
inflate
(
&
zstream
,
Z_SYNC_FLUSH
);
if
(
ret
==
Z_STREAM_END
||
ret
==
Z_BUF_ERROR
)
break
;
if
(
ret
!=
Z_OK
)
{
printf
(
"Error while decompressing: %d
\n
"
,
ret
);
inflateEnd
(
&
zstream
);
exit
(
1
);
}
dbgprintf
(
"a_in: %d t_in: %d a_out: %d t_out: %d -- %d out
\n
"
,
zstream
.
avail_in
,
zstream
.
total_in
,
zstream
.
avail_out
,
zstream
.
total_out
,
zstream
.
total_out
-
last_out
);
dbgprintf
(
"a_in: %d t_in: %d a_out: %d t_out: %d -- %d out
\n
"
,
zstream
.
avail_in
,
zstream
.
total_in
,
zstream
.
avail_out
,
zstream
.
total_out
,
zstream
.
total_out
-
last_out
);
write
(
fd_out
,
&
buf_out
,
zstream
.
total_out
-
last_out
);
write
(
fd_out
,
&
buf_out
,
zstream
.
total_out
-
last_out
);
i
+=
len
;
i
+=
len
;
}
if
(
zstream
.
total_out
!=
uncomp_len
-
8
)
{
printf
(
"Size mismatch (%d != %d), updating header...
\n
"
,
zstream
.
total_out
,
uncomp_len
-
8
);
printf
(
"Size mismatch (%d != %d), updating header...
\n
"
,
zstream
.
total_out
,
uncomp_len
-
8
);
buf_in
[
0
]
=
(
zstream
.
total_out
+
8
)
&
0xff
;
buf_in
[
1
]
=
(
zstream
.
total_out
+
8
>>
8
)
&
0xff
;
buf_in
[
2
]
=
(
zstream
.
total_out
+
8
>>
16
)
&
0xff
;
buf_in
[
3
]
=
(
zstream
.
total_out
+
8
>>
24
)
&
0xff
;
buf_in
[
0
]
=
(
zstream
.
total_out
+
8
)
&
0xff
;
buf_in
[
1
]
=
(
zstream
.
total_out
+
8
>>
8
)
&
0xff
;
buf_in
[
2
]
=
(
zstream
.
total_out
+
8
>>
16
)
&
0xff
;
buf_in
[
3
]
=
(
zstream
.
total_out
+
8
>>
24
)
&
0xff
;
lseek
(
fd_out
,
4
,
SEEK_SET
);
write
(
fd_out
,
&
buf_in
,
4
);
lseek
(
fd_out
,
4
,
SEEK_SET
);
write
(
fd_out
,
&
buf_in
,
4
);
}
inflateEnd
(
&
zstream
);
...
...
doc/texi2pod.pl
View file @
bb270c08
...
...
@@ -39,24 +39,24 @@ $ibase = "";
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(defined $inf) {
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 @@ while(<$inf>) {
# 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 @@ while(<$inf>) {
# 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)$/
;
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
;
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
";
}
# 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
;
$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
";
}
};
# 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 @@ while(<$inf>) {
# 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
;