fixed manpages (thanks Christian Welzel)

17 files changed, 57 insertions, 55 deletions

diff --git a/parsedoc.pl b/parsedoc.pl
index 4713716b..eab30004 100644
--- a/parsedoc.pl
+++ b/parsedoc.pl
@@ -56,18 +56,20 @@ sub add_header_to_manpage
     my $newusage = "";
     chomp $date;
 
-    split(/\n/,$usage);
+    $long_description =~ s/([^\\])-/\1\\-/g;
+    
+    my @chunks = split(/\n/,$usage);
     my $p  = "";
-    foreach my $u (@_) {
+    foreach my $u (@chunks) {
 	$u =~ s/%s/$progname/g;
 	$newusage .= "$p.B $u\n";
 	$p = ".PP\n";
     }
-
+    $newusage =~ s/([^\\])-/\1\\-/g;
     print manpage << "EOF"
 .TH $progname "1" "$date" "$progname" "$package"
 .SH NAME
-$progname - $short_description
+$progname \\- $short_description
 .SH Synopsis
 $newusage
 .SH DESCRIPTION
@@ -147,6 +149,7 @@ my $tail = "";
 while(<fi>) {
     $tail .= $_;
 }
+$tail =~ s/([^\\])-/\1\\-/g;
 
 print manpage $tail;
 close(manpage);
@@ -177,10 +180,10 @@ while(<$cfile>)
 	while(<$cfile>) {
 	    last if(/}\s*$/);
 	}
-	split(/\n/,$usage);
+	my @chunks = split(/\n/,$usage);
 	my $prefix = "Usage:";
 	my $u;
-	foreach $u (@_) {
+	foreach $u (@chunks) {
 	    if($u =~ /%s/) {
 		$src .= "    printf(\"$prefix $u\\n\", name);\n";
 	    } else {
diff --git a/src/as3compile.1 b/src/as3compile.1
index cb207e41..f7a2b076 100644
--- a/src/as3compile.1
+++ b/src/as3compile.1
@@ -1,9 +1,9 @@
-.TH as3compile "1" "April 2009" "as3compile" "swftools"
+.TH as3compile "1" "February 2012" "as3compile" "swftools"
 .SH NAME
-as3compile - Compile .as ActionScript 3.0 files to swf.
+as3compile \- Compile .as ActionScript 3.0 files to swf.
 
 .SH Synopsis
-.B as3compile file.as [-o file.swf] 
+.B as3compile file.as [\-o file.swf] 
 
 .SH DESCRIPTION
 Compiles a file written in ActionScript 3.0 to a SWF file.
@@ -63,7 +63,7 @@ Compiles a file written in ActionScript 3.0 to a SWF file.
 .SH EXAMPLE
 
  The following is a basic as3 file that can be compiled e.g.
- with \fBas3compile -X 400 -Y 400 smiley.as\fR
+ with \fBas3compile \-X 400 \-Y 400 smiley.as\fR
 
  // smiley.as
  package
diff --git a/src/as3compile.c b/src/as3compile.c
index 9ee4569e..c5f57c14 100644
--- a/src/as3compile.c
+++ b/src/as3compile.c
@@ -161,7 +161,7 @@ void args_callback_usage(char *name)
     printf("-X , --width                   Set target SWF width\n");
     printf("-Y , --height                  Set target SWF width\n");
     printf("-r , --rate                    Set target SWF framerate\n");
-    printf("-M , --mainclass               Set the name of the main class (extending flash.display.MovieClip or .Sprite)\n");
+    printf("-M , --mainclass               Set the name of the main class (extending flash.display.MovieClip)\n");
     printf("-l , --library <file>          Include library file <file>. <file> can be an .abc or .swf file.\n");
     printf("-I , --include <dir>           Add additional include dir <dir>.\n");
     printf("-N , --local-with-network      Make output file \"local with networking\"\n");
diff --git a/src/font2swf.1 b/src/font2swf.1
index 9b4a9f6d..a7cfba76 100644
--- a/src/font2swf.1
+++ b/src/font2swf.1
@@ -1,6 +1,6 @@
-.TH font2swf "1" "April 2009" "font2swf" "swftools"
+.TH font2swf "1" "February 2012" "font2swf" "swftools"
 .SH NAME
-font2swf - Converts a font to SWF.
+font2swf \- Converts a font to SWF.
 
 .SH Synopsis
 .B font2swf <fontfile>
diff --git a/src/font2swf.c b/src/font2swf.c
index 972f2943..0eed8ac4 100644
--- a/src/font2swf.c
+++ b/src/font2swf.c
@@ -36,7 +36,6 @@ static char config_flashtype = 0;
 static struct options_t options[] = {
 {"h", "help"},
 {"v", "verbose"},
-{"T", "flashtype"},
 {"o", "output"},
 {"V", "version"},
 {0,0}
diff --git a/src/gif2swf.1 b/src/gif2swf.1
index 56fd09d8..461f523f 100644
--- a/src/gif2swf.1
+++ b/src/gif2swf.1
@@ -1,14 +1,14 @@
-.TH gif2swf "1" "April 2009" "gif2swf" "swftools"
+.TH gif2swf "1" "February 2012" "gif2swf" "swftools"
 .SH NAME
-gif2swf - Takes a number of gif  files and converts them to a swf movie, one
+gif2swf \- Takes a number of gif  files and converts them to a swf movie, one
 picture per frame.
 
 .SH Synopsis
-.B gif2swf [-X width] [-Y height] [-o file.swf] [-r rate] file1.gif [file2.gif ...]
+.B gif2swf [\-X width] [\-Y height] [\-o file.swf] [\-r rate] file1.gif [file2.gif ...]
 
 .SH DESCRIPTION
 This tools converts gif image files into an SWF animation. It takes any
-number of input pictures, and converts them to SWF one-by-one, where every
+number of input pictures, and converts them to SWF one\-by\-one, where every
 converted picture is a seperate frame in the target SWF. 
 
 .SH OPTIONS
diff --git a/src/jpeg2swf.1 b/src/jpeg2swf.1
index 3da21bba..f04da56f 100644
--- a/src/jpeg2swf.1
+++ b/src/jpeg2swf.1
@@ -1,13 +1,13 @@
-.TH jpeg2swf "1" "August 2009" "jpeg2swf" "swftools"
+.TH jpeg2swf "1" "February 2012" "jpeg2swf" "swftools"
 .SH NAME
-jpeg2swf - Converts jpeg images to SWF.
+jpeg2swf \- Converts jpeg images to SWF.
 
 .SH Synopsis
-.B jpeg2swf [-options [value]] imagefiles[.jpg]|[.jpeg] [...]
+.B jpeg2swf [\-options [value]] imagefiles[.jpg]|[.jpeg] [...]
 
 .SH DESCRIPTION
 This tool converts jpeg image files into an SWF animation. It takes any
-number of input pictures, and converts them to SWF one-by-one, where every
+number of input pictures, and converts them to SWF one\-by\-one, where every
 converted picture is a seperate frame in the target SWF.
 
 .SH OPTIONS
@@ -57,6 +57,6 @@ converted picture is a seperate frame in the target SWF.
     Make importable as asset with \fIassetname\fR
 .SH AUTHORS
 
-Rainer Böhme <rfxswf@reflex-studio.de>
+Rainer Böhme <rfxswf@reflex\-studio.de>
 .TP
 Matthias Kramm
diff --git a/src/pdf2pdf.1 b/src/pdf2pdf.1
index a13a7213..c4134732 100644
--- a/src/pdf2pdf.1
+++ b/src/pdf2pdf.1
@@ -1,6 +1,6 @@
-.TH pdf2pdf "1" "August 2009" "pdf2pdf" "swftools"
+.TH pdf2pdf "1" "February 2012" "pdf2pdf" "swftools"
 .SH NAME
-pdf2pdf - Runs a pdf through the pdf2swf conversion engine, and writes it back to a pdf.
+pdf2pdf \- Runs a pdf through the pdf2swf conversion engine, and writes it back to a pdf.
 
 .SH Synopsis
 .B pdf2pdf <pdffile>
diff --git a/src/png2swf.1 b/src/png2swf.1
index e69679f5..df8d1670 100644
--- a/src/png2swf.1
+++ b/src/png2swf.1
@@ -1,18 +1,18 @@
-.TH png2swf "1" "April 2009" "png2swf" "swftools"
+.TH png2swf "1" "February 2012" "png2swf" "swftools"
 .SH NAME
-png2swf - Takes a number of png files and converts them to a swf movie, one
+png2swf \- Takes a number of png files and converts them to a swf movie, one
 picture per frame.
 
 .SH Synopsis
-.B png2swf [-X width] [-Y height] [-o file.swf] [-r rate] file1.png [file2.png...]
+.B png2swf [\-X width] [\-Y height] [\-o file.swf] [\-r rate] file1.png [file2.png...]
 
 .SH DESCRIPTION
 This tools converts png image files into an SWF animation. It takes any
-number of input pictures, and converts them to SWF one-by-one, where every
+number of input pictures, and converts them to SWF one\-by\-one, where every
 converted picture is a seperate frame in the target SWF. 
 .PP
 The way the
-images are encoded in SWF is very similar to PNG (in that a zlib-based, lossless
+images are encoded in SWF is very similar to PNG (in that a zlib\-based, lossless
 compression algorithm is used).
 
 .SH OPTIONS
diff --git a/src/png2swf.c b/src/png2swf.c
index 92a71a59..a7790469 100644
--- a/src/png2swf.c
+++ b/src/png2swf.c
@@ -777,7 +777,7 @@ void args_callback_usage(char *name)
     printf("-q , --quiet                   Omit normal log messages, only log errors\n");
     printf("-C , --cgi                     For use as CGI- prepend http header, write to stdout\n");
     printf("-V , --version                 Print version information and exit\n");
-    printf("-s , --scale <percent>         Scale image to <percent>%% size.\n");
+    printf("-s , --scale <percent>         Scale image to <percent>% size.\n");
     printf("\n");
 }
 
diff --git a/src/swfbbox.1 b/src/swfbbox.1
index 636a3b10..5b057eec 100644
--- a/src/swfbbox.1
+++ b/src/swfbbox.1
@@ -1,9 +1,9 @@
-.TH swfbbox "1" "April 2009" "swfbbox" "swftools"
+.TH swfbbox "1" "February 2012" "swfbbox" "swftools"
 .SH NAME
-swfbbox - Tool for playing around with SWF bounding boxes.
+swfbbox \- Tool for playing around with SWF bounding boxes.
 
 .SH Synopsis
-.B swfbbox [-OS] file.swf
+.B swfbbox [\-OS] file.swf
 
 .SH DESCRIPTION
 This tool can, among others, recalculate some bounding boxes of SWFs
diff --git a/src/swfbytes.1 b/src/swfbytes.1
index ae14406c..979bacf6 100644
--- a/src/swfbytes.1
+++ b/src/swfbytes.1
@@ -1,9 +1,9 @@
-.TH swfbytes "1" "August 2009" "swfbytes" "swftools"
+.TH swfbytes "1" "February 2012" "swfbytes" "swftools"
 .SH NAME
-swfbytes - Tool for simplifying the hex-editing of SWF files.
+swfbytes \- Tool for simplifying the hex-editing of SWF files.
 
 .SH Synopsis
-.B swfbytes [-v] file.swf > file.hexdump
+.B swfbytes [\-v] file.swf > file.hexdump
 .PP
 .B swfbytes file.hexdump
 
diff --git a/src/swfc.1 b/src/swfc.1
index efca89cc..7c6b8049 100644
--- a/src/swfc.1
+++ b/src/swfc.1
@@ -1,9 +1,9 @@
-.TH swfc "1" "April 2009" "swfc" "swftools"
+.TH swfc "1" "February 2012" "swfc" "swftools"
 .SH NAME
-swfc - compile .sc files to swf.
+swfc \- compile .sc files to swf.
 
 .SH Synopsis
-.B swfc [-o file.swf] file.sc
+.B swfc [\-o file.swf] file.sc
 
 .SH DESCRIPTION
 Compiles a file written in sc (SWF Script) into a number of SWF files.
diff --git a/src/swfcombine.1 b/src/swfcombine.1
index 00552210..a4ef8eed 100644
--- a/src/swfcombine.1
+++ b/src/swfcombine.1
@@ -1,15 +1,15 @@
-.TH swfcombine "1" "August 2009" "swfcombine" "swftools"
+.TH swfcombine "1" "February 2012" "swfcombine" "swftools"
 .SH NAME
-swfcombine - a tool for combining swf (flash) files
+swfcombine \- a tool for combining swf (flash) files
 
 .SH Synopsis
-.B swfcombine [-rXYomlcv] [-f] masterfile [-xysf] [(name1|#id1)=]slavefile1 .. [-xysf] [(nameN|#idN)=]slavefileN
+.B swfcombine [\-rXYomlcv] [\-f] masterfile [\-xysf] [(name1|#id1)=]slavefile1 .. [\-xysf] [(nameN|#idN)=]slavefileN
 .PP
-.B swfcombine [-rXYomv] --stack[1] [-xysf] [(name1|#id1)=]slavefile1 .. [-xysf] [(nameN|#idN)=]slavefileN
+.B swfcombine [\-rXYomv] \--stack[1] [\-xysf] [(name1|#id1)=]slavefile1 .. [\-xysf] [(nameN|#idN)=]slavefileN
 .PP
-.B swfcombine [-rXYov] --cat [-xysf] [(name1|#id1)=]slavefile1 .. [-xysf] [(nameN|#idN)=]slavefileN
+.B swfcombine [\-rXYov] \--cat [\-xysf] [(name1|#id1)=]slavefile1 .. [\-xysf] [(nameN|#idN)=]slavefileN
 .PP
-.B swfcombine [-rXYomlcv] --dummy [-xys] [file]
+.B swfcombine [\-rXYomlcv] \--dummy [\-xys] [file]
 
 .SH DESCRIPTION
 Take two or more SWF files, and combine them into a new SWF. SWFs can either
@@ -120,7 +120,7 @@ the decimal number of the file, starting by zero (00).
 Create two flash movies. Insert some rectangle into one of them, and give
 it a name. (E.g. "foo") Now call
 
-swfcombine -o combined.swf master.swf foo=slave.swf
+swfcombine \-o combined.swf master.swf foo=slave.swf
 
 As a result, the slave movie should be visible inside the master movie
 at the position where the rectangle used to be.
diff --git a/src/swfcombine.c b/src/swfcombine.c
index b7918c15..5a78f791 100644
--- a/src/swfcombine.c
+++ b/src/swfcombine.c
@@ -309,7 +309,7 @@ void args_callback_usage(char *name)
     printf("OR:    %s [-rXYomlcv] --dummy [-xys] [file]\n", name);
     printf("\n");
     printf("-o , --output <outputfile>      explicitly specify output file. (otherwise, output.swf will be used)\n");
-    printf("-t , --stack                   place each slave in a separate frame (no master movie)\n");
+    printf("-t , --stack                   place each slave in a seperate frame (no master movie)\n");
     printf("-T , --stack1                  place each slave in the first frame (no master movie)\n");
     printf("-m , --merge                   Don't store the slaves in Sprites/MovieClips\n");
     printf("-a , --cat                     concatenate all slave files (no master movie)\n");
@@ -321,7 +321,7 @@ void args_callback_usage(char *name)
     printf("-f , --frame                   The following identifier is a frame or framelabel, not an id or objectname\n");
     printf("-x , --movex <xpos>            x Adjust position of slave by <xpos> pixels\n");
     printf("-y , --movey <ypos>            y Adjust position of slave by <ypos> pixels\n");
-    printf("-s , --scale <scale>           Adjust size of slave by <scale> percent (e.g. 100%% = original size)\n");
+    printf("-s , --scale <scale>           Adjust size of slave by <scale> percent (e.g. 100% = original size)\n");
     printf("-r , --rate <fps>              Set movie framerate to <fps> (frames/sec)\n");
     printf("-X , --width <width>           Force movie bbox width to <width> (default: use master width (not with -t))\n");
     printf("-Y , --height <height>          Force movie bbox height to <height> (default: use master height (not with -t))\n");
diff --git a/src/swfdump.1 b/src/swfdump.1
index 0bde677c..58f373b5 100644
--- a/src/swfdump.1
+++ b/src/swfdump.1
@@ -1,9 +1,9 @@
-.TH swfdump "1" "April 2009" "swfdump" "swftools"
+.TH swfdump "1" "February 2012" "swfdump" "swftools"
 .SH NAME
-swfdump - Display an SWF file's content.
+swfdump \- Display an SWF file's content.
 
 .SH Synopsis
-.B swfdump [-atpdu] file.swf
+.B swfdump [\-atpdu] file.swf
 
 .SH DESCRIPTION
 A tool for displaying information about flash files
diff --git a/src/wav2swf.1 b/src/wav2swf.1
index c8376805..0dacaa44 100644
--- a/src/wav2swf.1
+++ b/src/wav2swf.1
@@ -1,9 +1,9 @@
-.TH wav2swf "1" "April 2009" "wav2swf" "swftools"
+.TH wav2swf "1" "February 2012" "wav2swf" "swftools"
 .SH NAME
-wav2swf - convert a WAV file to an SWF animation.
+wav2swf \- convert a WAV file to an SWF animation.
 
 .SH Synopsis
-.B wav2swf [-o filename] file.wav
+.B wav2swf [\-o filename] file.wav
 
 .SH DESCRIPTION
 Takes a wav file and converts it to a swf movie.