escape % chars in --help output

15 files changed, 16 insertions, 14 deletions

diff --git a/parsedoc.pl b/parsedoc.pl
index eab30004..898e7bba 100644
--- a/parsedoc.pl
+++ b/parsedoc.pl
@@ -42,6 +42,7 @@ sub add_option_to_help
     my $s1 = " "x(2-length($shortopt));
     my $s2 = " "x(20-length($longopt." ".$params));
     $doc =~ s/"/\\"/g;
+    $doc =~ s/%/%%/g;
     $paramhelp .= "    printf(\"-$shortopt$s1, --$longopt $params$s2$doc\\n\");\n";
 }
 
@@ -187,6 +188,7 @@ while(<$cfile>)
 	    if($u =~ /%s/) {
 		$src .= "    printf(\"$prefix $u\\n\", name);\n";
 	    } else {
+                $u =~ s/%/%%/;
 		$src .= "    printf(\"$prefix $u\\n\");\n";
 	    }
 	    $prefix = "OR:   ";
diff --git a/src/as3compile.1 b/src/as3compile.1
index f7a2b076..d2159af4 100644
--- a/src/as3compile.1
+++ b/src/as3compile.1
@@ -1,4 +1,4 @@
-.TH as3compile "1" "February 2012" "as3compile" "swftools"
+.TH as3compile "1" "April 2012" "as3compile" "swftools"
 .SH NAME
 as3compile \- Compile .as ActionScript 3.0 files to swf.
 
diff --git a/src/font2swf.1 b/src/font2swf.1
index a7cfba76..9010b7d0 100644
--- a/src/font2swf.1
+++ b/src/font2swf.1
@@ -1,4 +1,4 @@
-.TH font2swf "1" "February 2012" "font2swf" "swftools"
+.TH font2swf "1" "April 2012" "font2swf" "swftools"
 .SH NAME
 font2swf \- Converts a font to SWF.
 
diff --git a/src/gif2swf.1 b/src/gif2swf.1
index 461f523f..ee276247 100644
--- a/src/gif2swf.1
+++ b/src/gif2swf.1
@@ -1,4 +1,4 @@
-.TH gif2swf "1" "February 2012" "gif2swf" "swftools"
+.TH gif2swf "1" "April 2012" "gif2swf" "swftools"
 .SH NAME
 gif2swf \- Takes a number of gif  files and converts them to a swf movie, one
 picture per frame.
diff --git a/src/jpeg2swf.1 b/src/jpeg2swf.1
index f04da56f..5d27aa37 100644
--- a/src/jpeg2swf.1
+++ b/src/jpeg2swf.1
@@ -1,4 +1,4 @@
-.TH jpeg2swf "1" "February 2012" "jpeg2swf" "swftools"
+.TH jpeg2swf "1" "April 2012" "jpeg2swf" "swftools"
 .SH NAME
 jpeg2swf \- Converts jpeg images to SWF.
 
diff --git a/src/pdf2pdf.1 b/src/pdf2pdf.1
index c4134732..12db4762 100644
--- a/src/pdf2pdf.1
+++ b/src/pdf2pdf.1
@@ -1,4 +1,4 @@
-.TH pdf2pdf "1" "February 2012" "pdf2pdf" "swftools"
+.TH pdf2pdf "1" "April 2012" "pdf2pdf" "swftools"
 .SH NAME
 pdf2pdf \- Runs a pdf through the pdf2swf conversion engine, and writes it back to a pdf.
 
diff --git a/src/png2swf.1 b/src/png2swf.1
index df8d1670..026459b0 100644
--- a/src/png2swf.1
+++ b/src/png2swf.1
@@ -1,4 +1,4 @@
-.TH png2swf "1" "February 2012" "png2swf" "swftools"
+.TH png2swf "1" "April 2012" "png2swf" "swftools"
 .SH NAME
 png2swf \- Takes a number of png files and converts them to a swf movie, one
 picture per frame.
diff --git a/src/png2swf.c b/src/png2swf.c
index a7790469..92a71a59 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 5b057eec..54a4f222 100644
--- a/src/swfbbox.1
+++ b/src/swfbbox.1
@@ -1,4 +1,4 @@
-.TH swfbbox "1" "February 2012" "swfbbox" "swftools"
+.TH swfbbox "1" "April 2012" "swfbbox" "swftools"
 .SH NAME
 swfbbox \- Tool for playing around with SWF bounding boxes.
 
diff --git a/src/swfbytes.1 b/src/swfbytes.1
index 979bacf6..6fa1a177 100644
--- a/src/swfbytes.1
+++ b/src/swfbytes.1
@@ -1,4 +1,4 @@
-.TH swfbytes "1" "February 2012" "swfbytes" "swftools"
+.TH swfbytes "1" "April 2012" "swfbytes" "swftools"
 .SH NAME
 swfbytes \- Tool for simplifying the hex-editing of SWF files.
 
diff --git a/src/swfc.1 b/src/swfc.1
index 7c6b8049..daf95541 100644
--- a/src/swfc.1
+++ b/src/swfc.1
@@ -1,4 +1,4 @@
-.TH swfc "1" "February 2012" "swfc" "swftools"
+.TH swfc "1" "April 2012" "swfc" "swftools"
 .SH NAME
 swfc \- compile .sc files to swf.
 
diff --git a/src/swfcombine.1 b/src/swfcombine.1
index a4ef8eed..6a0d5bbe 100644
--- a/src/swfcombine.1
+++ b/src/swfcombine.1
@@ -1,4 +1,4 @@
-.TH swfcombine "1" "February 2012" "swfcombine" "swftools"
+.TH swfcombine "1" "April 2012" "swfcombine" "swftools"
 .SH NAME
 swfcombine \- a tool for combining swf (flash) files
 
diff --git a/src/swfcombine.c b/src/swfcombine.c
index 5a78f791..2766e616 100644
--- a/src/swfcombine.c
+++ b/src/swfcombine.c
@@ -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 58f373b5..ebcde4e0 100644
--- a/src/swfdump.1
+++ b/src/swfdump.1
@@ -1,4 +1,4 @@
-.TH swfdump "1" "February 2012" "swfdump" "swftools"
+.TH swfdump "1" "April 2012" "swfdump" "swftools"
 .SH NAME
 swfdump \- Display an SWF file's content.
 
diff --git a/src/wav2swf.1 b/src/wav2swf.1
index 0dacaa44..576e4a76 100644
--- a/src/wav2swf.1
+++ b/src/wav2swf.1
@@ -1,4 +1,4 @@
-.TH wav2swf "1" "February 2012" "wav2swf" "swftools"
+.TH wav2swf "1" "April 2012" "wav2swf" "swftools"
 .SH NAME
 wav2swf \- convert a WAV file to an SWF animation.