X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfcombine.1;h=5d46995e53345e5bc016de00c8a2c0a603341bd3;hb=23c1c9363c730dfafc683bd00920a2c33cc07ee2;hp=b955db09647cec3da3c0ff88ca111a8c911a6c24;hpb=7a288be1a024ee8b5f36bc84cf078cb71cbd0dfb;p=swftools.git

diff --git a/src/swfcombine.1 b/src/swfcombine.1
index b955db0..5d46995 100644
--- a/src/swfcombine.1
+++ b/src/swfcombine.1
@@ -12,6 +12,9 @@ swfcombine - a tool for combining swf (flash) files
 [\fIoptions\fR] --stack [\fIslavename1=\fR][\fIslavefile1.swf\fR] ... [\fIslavenameN=\fR][\fIslavefileN.swf\fR]
 
 .B swfcombine
+[\fIoptions\fR] --cat [\fIslavename1=\fR][\fIslavefile1.swf\fR] ... [\fIslavenameN=\fR][\fIslavefileN.swf\fR]
+
+.B swfcombine
 [\fIoptions\fR] --dummy [\fIfile.swf\fR]
 .SH DESCRIPTION
 Take two or more SWF files, and combine them into a new SWF. SWFs can either
@@ -34,12 +37,19 @@ Print version info and exit
 \fB\-o\fR, \fB\-\-output\fR \fIfilename\fR
 Explicitly specify output file. (otherwise, output.swf will be used)
 .TP
+\fB\-z\fR, \fB\-\-zlib\fR
+Use Flash MX (SWF 6) Zlib encoding for the output. The resulting SWF will be
+smaller, but not playable in Flash Plugins of Version 5 and below.
+.TP
 \fB\-l\fR, \fB\-\-overlay\fR
 Don't remove any master objects, only overlay new objects.
 .TP
 \fB\-c\fR, \fB\-\-clip\fR
 Clip the slave objects by the corresponding master objects.
 .TP
+\fB\-m\fR, \fB\-\-merge\fR
+Do not store the slave files in a sprite/MovieClip. Instead, merge the files frame by frame.
+.TP
 \fB\-d\fR, \fB\-\-dummy\fR
 Don't require the presence of slave objects. Usually used together with \fB\-X\fR, \fB\-Y\fR or \fB\-r\fR.
 .TP
@@ -50,6 +60,9 @@ Be verbose. Use more than one -v for greater effect.
 Don't assume the first file is a master file. Instead, store each
 file in a seperate frame.
 .TP
+\fB\-a\fR, \fB\-\-cat\fR
+Like -t, but concatenate the files.
+.TP
 \fB\-X\fR, \fB\-\-width\fR \fIwidth\fR
 Force the output to width \fIwidth\fR. (Otherwise, the width of the master file will be used)
 .TP
@@ -59,6 +72,10 @@ Force the output to height \fIheight\fR. (Otherwise, the height of the master fi
 \fB\-r\fR, \fB\-\-rate\fR \fIrate\fR
 Force the output to have the framerate \fIrate\fR. (Otherwise, the framerate of the master file will be used)
 .TP
+\fB\-f\fR, \fB\-\-frame\fR
+The next slave replaces a frame, not an object. Therefore the slave identifier is a
+frame number (#frame=) or frame label (framelabel=).
+.TP
 \fB\-x\fR, \fB\-\-xpos\fR \fIxpos\fR
 (move x) Adjust position of slave by xpos twips (1/20 pixel).
 .TP