X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fpdf2swf.cc;h=fc6bad18826bc8548a09e16b95cb39d55da79a0b;hb=e3568797f32e95acba1d3ba4be5b43073a8a9955;hp=ecbc36617feb8cee0335f5838abc493c244b65e3;hpb=a13c36769b437418458b56b3919b726c932ec8a1;p=swftools.git

diff --git a/pdf2swf/pdf2swf.cc b/pdf2swf/pdf2swf.cc
index ecbc366..fc6bad1 100644
--- a/pdf2swf/pdf2swf.cc
+++ b/pdf2swf/pdf2swf.cc
@@ -3,9 +3,21 @@
 
    Part of the swftools package.
    
-   Copyright (c) 2001 Matthias Kramm <kramm@quiss.org> 
+   Copyright (c) 2001,2002,2003 Matthias Kramm <kramm@quiss.org> 
+ 
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-   This file is distributed under the GPL, see file COPYING for details */
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -16,21 +28,29 @@
 #ifdef HAVE_DIRENT_H
 #include <dirent.h>
 #endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
 #include "../lib/args.h"
+#include "../lib/os.h"
+#include "../lib/rfxswf.h"
 #include "SWFOutputDev.h"
-#include "t1lib.h"
-extern "C" {
 #include "log.h"
-}
+
+#define FONTDIR concatPaths(getInstallationPath(), "fonts")
+#define SWFDIR concatPaths(getInstallationPath(), "swfs")
 
 static char * outputname = 0;
 static int loglevel = 3;
 static char * pagerange = 0;
 static char * filename = 0;
 static char * password = 0;
+static int zlib = 0;
 
 static char * preloader = 0;
 static char * viewer = 0;
+static int xnup = 1;
+static int ynup = 1;
 
 char* fontpaths[256];
 int fontpathpos = 0;
@@ -67,11 +87,31 @@ int args_callback_option(char*name,char*val) {
     else if (!strcmp(name, "v"))
     {
 	loglevel ++;
+        setConsoleLogging(loglevel);
+	return 0;
+    }
+    else if (!strcmp(name, "2"))
+    {
+        xnup = 2;
+        ynup = 1;
+	return 0;
+    }
+    else if (!strcmp(name, "4"))
+    {
+        xnup = 2;
+        ynup = 2;
+	return 0;
+    }
+    else if (!strcmp(name, "9"))
+    {
+        xnup = 3;
+        ynup = 3;
 	return 0;
     }
     else if (!strcmp(name, "q"))
     {
 	loglevel --;
+        setConsoleLogging(loglevel);
 	system_quiet = 1;
 	return 0;
     }
@@ -97,27 +137,60 @@ int args_callback_option(char*name,char*val) {
     }
     else if (!strcmp(name, "s"))
     {
-	pdfswf_drawonlyshapes();
+	char*s = strdup(val);
+	char*c = strchr(s, '=');
+	if(c && *c && c[1])  {
+	    *c = 0;
+	    c++;
+	    pdfswf_setparameter(s,c);
+	}
+	else
+	    pdfswf_setparameter(s,"1");
+	return 1;
+    }
+    else if (!strcmp(name, "S"))
+    {
+	pdfswf_setparameter("drawonlyshapes", "1");
 	return 0;
     }
     else if (!strcmp(name, "i"))
     {
-	pdfswf_ignoredraworder();
+	pdfswf_setparameter("ignoredraworder", "1");
 	return 0;
     }
     else if (!strcmp(name, "z"))
     {
-	pdfswf_enablezlib();
+	pdfswf_setparameter("enablezlib", "1");
+	zlib = 1;
 	return 0;
     }
     else if (!strcmp(name, "n"))
     {
-	pdfswf_linksopennewwindow();
+	pdfswf_setparameter("opennewwindow", "1");
 	return 0;
     }
+    else if (!strcmp(name, "t"))
+    {
+	pdfswf_setparameter("insertstop", "1");
+	return 0;
+    }
+    else if (!strcmp(name, "T"))
+    {
+	if(!strcasecmp(val, "mx"))
+	    pdfswf_setparameter("flashversion", "6");
+	else
+	    pdfswf_setparameter("flashversion", val);
+
+	return 1;
+    }
     else if (!strcmp(name, "f"))
     {
-	pdfswf_storeallcharacters();
+	pdfswf_setparameter("storeallcharacters", "1");
+	return 0;
+    }
+    else if (!strcmp(name, "w"))
+    {
+	pdfswf_setparameter("linksopennewwindow", "0");
 	return 0;
     }
     else if (!strcmp(name, "F"))
@@ -134,14 +207,14 @@ int args_callback_option(char*name,char*val) {
     else if (!strcmp(name, "l"))
     {
 	char buf[256];
-	sprintf(buf, "%s/swfs/default_loader.swf", DATADIR);
+	sprintf(buf, "%s/default_loader.swf", SWFDIR);
 	preloader = strdup(buf);
 	return 0;
     }
     else if (!strcmp(name, "b"))
     {
 	char buf[256];
-	sprintf(buf, "%s/swfs/default_viewer.swf", DATADIR);
+	sprintf(buf, "%s/default_viewer.swf", SWFDIR);
 	viewer = strdup(buf);
 	return 0;
     }
@@ -153,7 +226,7 @@ int args_callback_option(char*name,char*val) {
 	}
 	else
 	{
-	    systemf("ls %s/swfs/*_loader.swf", DATADIR);
+	    systemf("ls %s/*_loader.swf", SWFDIR);
 	    if(!system_quiet)
 		printf("\n");
 	    exit(1);
@@ -168,20 +241,20 @@ int args_callback_option(char*name,char*val) {
 	}
 	else
 	{
-	    systemf("ls %s/swfs/*_viewer.swf", DATADIR);
+	    systemf("ls %s/*_viewer.swf", SWFDIR);
 	    if(!system_quiet)
 		printf("\n");
 	    exit(1);
 	}
 	return 1;
     }
-    else if (name[0]=='j')
+    else if (!strcmp(name, "j"))
     {
 	if(name[1]) {
-	    pdfswf_jpegquality(atoi(&name[1]));
+	    pdfswf_setparameter("jpegquality", &name[1]);
 	    return 0;
 	} else {
-	    pdfswf_jpegquality(atoi(val));
+	    pdfswf_setparameter("jpegquality", val);
 	    return 1;
 	}
     }
@@ -221,16 +294,19 @@ struct options_t options[] =
  {"V","version"},
  {"i","ignore"},
  {"z","zlib"},
- {"s","shapes"},
+ {"s","set"},
+ {"S","shapes"},
  {"j","jpegquality"},
  {"p","pages"},
  {"w","samewindow"},
  {"f","fonts"},
- {"F","fontpath"},
+ {"F","fontdir"},
  {"B","viewer"},
  {"L","preloader"},
  {"b","defaultviewer"},
  {"l","defaultpreloader"},
+ {"t","stop"},
+ {"T","flashversion"},
  {0,0}
 };
 
@@ -255,83 +331,62 @@ int args_callback_command(char*name, char*val) {
 
 void args_callback_usage(char*name)
 {
-    printf("Usage: %s [-si] [-j quality] [-p range] [-P password] input.pdf -o output.swf\n", name);
-    printf("\n");
+    printf("Usage: %s [Options] input.pdf [-o output.swf]\n", name);
+    printf("\nBasic options:\n");
     printf("-p  --pages=range          Convert only pages in range\n");
     printf("-P  --password=password    Use password for deciphering the pdf\n");
-    printf("-s  --shapes               Don't use SWF Fonts, but store everything as shape\n");
-    printf("-i  --ignore               Ignore draw order (makes the SWF file smaller, but may produce\n");
-    printf("                           graphic errors)\n");
-    printf("-z  --zlib                 Use Flash 6 (MX) zlib compression (Needs at least Flash 6 Plugin to play)\n");
-    printf("-j  --jpegquality=quality  Set quality of embedded jpeg pictures (default:85)\n");
     printf("-v  --verbose              Be verbose. Use more than one -v for greater effect\n");
     printf("-q  --quiet                Suppress normal messages. Use -qq to suppress warnings, also.\n");
-    printf("-w  --samewindow           Don't open a new Browser Window for Links in the SWF\n");
-#ifdef HAVE_DIRENT
+#ifdef HAVE_DIRENT_H
     printf("-F  --fontdir directory    Add directory to font search path\n");
 #endif
-    printf("-f  --fonts                Store full fonts in SWF. (Don't reduce to used characters)\n");
     printf("-V  --version              Print program version\n");
-#ifndef SYSTEM_BACKTICKS
-    printf("The following might not work because your system call doesn't support command substitution:\n");
-#endif
-    printf("-b  --defaultviewer        Link default viewer to the pdf (%s/swfs/default_viewer.swf)\n", DATADIR);
-    printf("-l  --defaultpreloader     Link default preloader the pdf (%s/swfs/default_loader.swf)\n", DATADIR);
+    printf("\nEnhanced conversion options:\n");
+    printf("-S  --shapes               Don't use SWF Fonts, but store everything as shape\n");
+    printf("-z  --zlib                 Use Flash 6 (MX) zlib compression (Needs at least Flash 6 Plugin to play)\n");
+    printf("-w  --samewindow           Don't open a new Browser Window for Links in the SWF\n");
+    printf("-f  --fonts                Store full fonts in SWF. (Don't reduce to used characters)\n");
+    printf("-T  --flashversion=num     Set the flash version in the header to num (default: 4)\n");
+    printf("-s insertstop              Insert a \"Stop\" Tag in every frame (don't turn pages automatically)\n");
+    printf("-s zoom=factor             Scale result, default: 72\n");
+    printf("-s jpegquality=quality     Set quality of embedded jpeg pictures (default:85)\n");
+    printf("-s caplinewidth=value      Set the minimum line width to trigger cap style handling to value. (3)\n");
+    printf("-s splinequality=value     Set the quality of spline convertion to value (0-100, default: 100).\n");
+    printf("-s fontquality=value       Set the quality of font convertion to value (0-100, default: 100).\n");
+    printf("-s ignoredraworder         Ignore draw order (makes the SWF file smaller and faster, but may produce\n"
+	   "                           graphic errors)\n");
+    printf("-s filloverlap             Make intersecting shapes overlap, instead of canceling each\n"
+	   "                           other out. (Needed for some Powerpoint PDFs)\n");
+    //deliberately undocumented (for now)
+    //printf("-2                         Put 2 pages into each frame.\n");
+    //printf("-4                         Put 4 pages into each frame.\n");
+    printf("Postprocessing options:\n");
+    printf("-b  --defaultviewer        Link default viewer to the pdf (%s)\n", concatPaths(SWFDIR, "default_viewer.swf"));
+    printf("-l  --defaultpreloader     Link default preloader the pdf (%s)\n", concatPaths(SWFDIR, "default_loader.swf"));
     printf("-B  --viewer=filename      Link viewer \"name\" to the pdf (\"%s -B\" for list)\n", name);
     printf("-L  --preloader=filename   Link preloader \"name\" to the pdf (\"%s -L\" for list)\n",name);
 }
 
-#ifdef HAVE_DIRENT_H
-void addfontdir(FILE*database, char* dirname, int*numfonts, char*searchpath) 
+float getRate(char*filename)
 {
-    if(searchpath) {
-	if(searchpath[0])
-	    strcat(searchpath, ":");
-	strcat(searchpath, dirname);
-    }
-    logf("<verbose> Adding %s to search path\n", dirname);
-
-    DIR*dir = opendir(dirname);
-    if(!dir) {
-	logf("<warning> Couldn't open directory %s\n", dirname);
-	return;
-    }
-    dirent*ent;
-    while(1) {
-	ent = readdir (dir);
-	if (!ent) 
-	    break;
-	int l;
-	char*name = ent->d_name;
-	char type = 0;
-	if(!name) continue;
-	l=strlen(name);
-	if(l<4)
-	    continue;
-	if(!strncasecmp(&name[l-4], ".afm", 4)) 
-	    type=1;
-	if(!strncasecmp(&name[l-4], ".ttf", 4)) 
-	    type=2;
-	if(type)
-	{
-	    if(database && type==1) {
-		char buf[256],a;
-		FILE*fi;
-		sprintf(buf, "%s/%s", dirname,name);
-		fi = fopen(buf, "rb");
-		if(!fi || !fread(&a,1,1,fi)) {
-		    logf("<warning> Couldn't read from %s", buf);
-		}
-		fprintf(database, "%s\n", buf);
-		logf("<verbose> Found font %s\n", buf);
-	    } 
-	    if(numfonts)
-		(*numfonts)++;
-	}
-    }
-    closedir(dir);
+    int fi;
+    SWF swf;
+    fi = open(filename,O_RDONLY|O_BINARY);
+    if(fi<0) { 
+	char buffer[256];
+	sprintf(buffer, "Couldn't open %s", filename);
+        perror(buffer);
+        exit(1);
+    }
+    if(swf_ReadSWF(fi,&swf) < 0)
+    { 
+        fprintf(stderr, "%s is not a valid SWF file or contains errors.\n",filename);
+        close(fi);
+        exit(1);
+    }
+    swf_FreeTags(&swf);
+    return swf.frameRate / 256.0;
 }
-#endif
 
 int main(int argn, char *argv[])
 {
@@ -340,6 +395,21 @@ int main(int argn, char *argv[])
     int numfonts = 0;
     int t;
     char t1searchpath[1024];
+    int nup_pos = 0;
+    int x,y;
+    
+    initLog(0,-1,0,0,-1,loglevel);
+
+#if defined(WIN32) && defined(HAVE_STAT) && defined(HAVE_SYS_STAT_H)
+    FILE*test = fopen(concatPaths(FONTDIR,"\\d050000l.afm"), "rb");
+    if(!test) {
+	fprintf(stderr, "Couldn't find file %s - pdf2swf not installed properly? OS says:\n", concatPaths(FONTDIR, "\\d050000l.afm"));
+	perror("open");
+	exit(1);
+    }
+    fclose(test);
+#endif
+
 #ifdef HAVE_SRAND48
     srand48(time(0));
 #else
@@ -348,7 +418,21 @@ int main(int argn, char *argv[])
 #endif
 #endif
     processargs(argn, argv);
-    initLog(0,-1,0,0,-1,loglevel);
+
+    if(!filename)
+    {
+	fprintf(stderr, "Please specify an input file\n");
+	exit(1);
+    }
+
+    if(!outputname)
+    {
+	if(filename) {
+	    outputname = stripFilename(filename, ".swf");
+	    msg("<notice> Output filename not given. Writing to %s", outputname);
+	} 
+    }
+	
     if(!outputname)
     {
 	fprintf(stderr, "Please use -o to specify an output file\n");
@@ -363,112 +447,162 @@ int main(int argn, char *argv[])
 	exit(0);
     }
 
-    logf("<verbose> reading font files from %s/fonts\n", DATADIR);
-    //TODO: use tempnam here. Check if environment already contains a
-    //T1LIB_CONFIG.
-    putenv( "T1LIB_CONFIG=/tmp/t1lib.config.tmp");
-    FILE*db = fopen("/tmp/FontDataBase", "wb");
-    FILE*fi = fopen("/tmp/t1lib.config.tmp", "wb");
-    if(!db || !fi) {
-	fprintf(stderr, "Couldn't create temporary file in /tmp/\n");
-	exit(1);
-    }
-    t1searchpath[0] = 0;
-#ifdef HAVE_DIRENT_H
-    sprintf(buf, "%s/fonts",DATADIR);
-    // pass 1
-    addfontdir(0, buf, &numfonts, 0);
-    for(t=0;t<fontpathpos;t++) {
-	addfontdir(0, fontpaths[t], &numfonts,0);
-    }
-    fprintf(db, "%d\n", numfonts);
-    // pass 2
-    addfontdir(db, buf, 0, t1searchpath);
+    /* add fonts */
+    pdfswf_addfontdir(FONTDIR);
     for(t=0;t<fontpathpos;t++) {
-	addfontdir(db, fontpaths[t], 0, t1searchpath);
+	pdfswf_addfontdir(fontpaths[t]);
     }
-#else
-/* This is a workaround. The correct way would be to
-   get directory listings working on all systems.
-*/
-    strcpy(t1searchpath, DATADIR);
-    strcat(t1searchpath, "/fonts");
-    fprintf(db, "14\n");
-    fprintf(db, "n021003l.afm\n");
-    fprintf(db, "n021023l.afm\n");
-    fprintf(db, "n021004l.afm\n");
-    fprintf(db, "n021024l.afm\n");
-    fprintf(db, "n019003l.afm\n");
-    fprintf(db, "n019023l.afm\n");
-    fprintf(db, "n019004l.afm\n");
-    fprintf(db, "n019024l.afm\n");
-    fprintf(db, "n022003l.afm\n");
-    fprintf(db, "n022023l.afm\n");
-    fprintf(db, "n022004l.afm\n");
-    fprintf(db, "n022024l.afm\n");
-    fprintf(db, "s050000l.afm\n");
-    fprintf(db, "d050000l.afm\n");
-#endif
 
-    fprintf(fi, "FONTDATABASE=/tmp/FontDataBase\n");
-    fprintf(fi, "ENCODING=%s:.\n", t1searchpath);
-    fprintf(fi, "AFM=%s:.\n", t1searchpath);
-    fprintf(fi, "TYPE1=%s:.\n", t1searchpath);
-    fclose(fi);
-    fclose(db);
-    /* initialize t1lib */
-    T1_SetBitmapPad( 16);
-    if ((T1_InitLib(NO_LOGFILE)==NULL)){
-	fprintf(stderr, "Initialization of t1lib failed\n");
-	exit(1);
+    pdf_doc_t* pdf = pdf_init(filename, password);
+    if(!pdf) {
+        msg("<error> Couldn't open %s", filename);
+        exit(1);
     }
-    unlink("/tmp/t1lib.config.tmp");
 
-    pdfswf_init(filename, password);
-    pdfswf_setoutputfilename(outputname);
+    swf_output_t* swf = swf_output_init();
 
-    int pages = pdfswf_numpages();
-    for(t = 1; t <= pages; t++) 
+    struct mypage_t {
+	int x;
+	int y;
+	pdf_page_t*page;
+	pdf_page_info_t*info;
+    } pages[4];
+
+    int pagenum = 0;
+    int frame = 1;
+    
+    for(int pagenr = 1; pagenr <= pdf->num_pages; pagenr++) 
     {
-	if(is_in_range(t, pagerange))
-	pdfswf_convertpage(t);
+	if(is_in_range(pagenr, pagerange)) {
+	    swf_output_preparepage(swf, pagenr, frame);
+	    pagenum++;
+	}
+	if(pagenum == xnup*ynup || (pagenr == pdf->num_pages && pagenum>1)) {
+	    pagenum = 0;
+	    frame++;
+	}
     }
-    pdfswf_performconversion();
 
-    pdfswf_close();
+    pagenum = 0;
 
-    if(viewer || preloader) {
-#ifndef SYSTEM_BACKTICKS
-	logf("<warning> Not sure whether system() can handle command substitution");
-	logf("<warning> (According to config.h, it can't)");
-#endif
-	if(!system_quiet)
-	    printf("\n");
+    for(int pagenr = 1; pagenr <= pdf->num_pages; pagenr++) 
+    {
+	if(is_in_range(pagenr, pagerange)) {
+	    pdf_page_t* page = pages[pagenum].page = pdf_getpage(pdf, pagenr);
+            pdf_page_info_t* info = pdf_page_getinfo(page);
+	    pages[pagenum].x = 0;
+	    pages[pagenum].y = 0;
+	    pages[pagenum].info = info;
+	    pages[pagenum].page = page;
+	    pagenum++;
+	}
+	if(pagenum == xnup*ynup || (pagenr == pdf->num_pages && pagenum>1)) {
+
+	    int t;
+	    int xmax[xnup], ymax[xnup];
+	    int x,y;
+	    int width=0, height=0;
+
+	    memset(xmax, 0, xnup*sizeof(int));
+	    memset(ymax, 0, ynup*sizeof(int));
+
+	    for(y=0;y<ynup;y++)
+	    for(x=0;x<xnup;x++) {
+		int t = y*xnup + x;
+
+		if(pages[t].info->xMax-pages[t].info->xMin > xmax[x])
+		    xmax[x] = pages[t].info->xMax-pages[t].info->xMin;
+		if(pages[t].info->yMax-pages[t].info->yMin > ymax[y])
+		    ymax[y] = pages[t].info->yMax-pages[t].info->yMin;
+	    }
+	    for(x=0;x<xnup;x++) {
+		width += xmax[x];
+		xmax[x] = width;
+	    }
+	    for(y=0;y<ynup;y++) {
+		height += ymax[y];
+		ymax[y] = height;
+	    }
+	    swf_output_startframe(swf, width, height);
+	    for(t=0;t<pagenum;t++) {
+		int x = t%xnup;
+		int y = t/xnup;
+		int xpos = x>0?xmax[x-1]:0;
+		int ypos = y>0?ymax[y-1]:0;
+		pdf_page_info_t*info = pages[t].info;
+		xpos -= info->xMin;
+		ypos -= info->yMin;
+		msg("<verbose> Render (%d,%d)-(%d,%d) move:%d/%d\n",
+			info->xMin + xpos,
+			info->yMin + ypos,
+			info->xMax + xpos,
+			info->yMax + ypos, xpos, ypos);
+		pdf_page_rendersection(pages[t].page, swf, xpos, 
+			                                   ypos,
+							   info->xMin + xpos, 
+							   info->yMin + ypos, 
+							   info->xMax + xpos, 
+							   info->yMax + ypos);
+	    }
+	    swf_output_endframe(swf);
+	    for(t=0;t<pagenum;t++)  {
+                pdf_page_info_destroy(pages[t].info);
+		pdf_page_destroy(pages[t].page);
+	    }
+	    pagenum = 0;
+	}
     }
+    if(swf_output_save(swf, outputname) < 0) {
+        exit(1);
+    }
+    int width = (int)swf_output_get(swf, "width");
+    int height = (int)swf_output_get(swf, "height");
+    msg("<notice> SWF written");
+    swf_output_destroy(swf);
+
+    pdf_destroy(pdf);
 
+    char*zip = "";
+    if(zlib)
+	zip = "-z";
+#undef SYSTEM_BACKTICKS
     if(viewer && !preloader) {
-	systemf("swfcombine `swfdump -XY %s` %s viewport=%s -o %s",
-		outputname, viewer, outputname, outputname);
+#ifdef SYSTEM_BACKTICKS
+	systemf("swfcombine %s `swfdump -XY \"%s\"` \"%s\" viewport=\"%s\" -o \"%s\"",zip,
+		viewer, outputname, outputname);
+#else
+	systemf("swfcombine %s -X %d -Y %d \"%s\" viewport=\"%s\" -o \"%s\"",zip,width,height,
+		viewer, outputname, outputname);
+#endif
 	if(!system_quiet)
 	    printf("\n");
     }
     if(preloader && !viewer) {
-	logf("<warning> --preloader option without --viewer option doesn't make very much sense.");
-	ret = systemf("swfcombine `swfdump -r %s` %s/swfs/PreLoaderTemplate.swf loader=%s movie=%s -o %s",
-		preloader, DATADIR, preloader, outputname, outputname);
+	msg("<warning> --preloader option without --viewer option doesn't make very much sense.");
+#ifdef SYSTEM_BACKTICKS
+	ret = systemf("swfcombine %s `swfdump -r \"%s\"` %s/PreLoaderTemplate.swf loader=\"%s\" movie=\"%s\" -o \"%s\"",zip,
+		preloader, SWFDIR, preloader, outputname, outputname);
+#else
+	ret = systemf("swfcombine %s -Y %d -X %d %s/PreLoaderTemplate.swf loader=\"%s\" movie=\"%s\" -o \"%s\"",zip,width,height,
+		SWFDIR, preloader, outputname, outputname);
+#endif
 	if(!system_quiet)
 	    printf("\n");
     }
     if(preloader && viewer) {
-	systemf("swfcombine %s viewport=%s -o __tmp__.swf",
+	systemf("swfcombine \"%s\" viewport=%s -o __tmp__.swf",
 		viewer, outputname, outputname);
-	systemf("swfcombine `swfdump -XY %s` `swfdump -r %s` %s/swfs/PreLoaderTemplate.swf loader=%s movie=__tmp__.swf -o %s",
-		outputname, preloader, DATADIR, preloader, outputname);
+#ifdef SYSTEM_BACKTICKS
+	systemf("swfcombine %s `swfdump -XY \"%s\"` `swfdump -r \"%s\"` %s/PreLoaderTemplate.swf loader=%s movie=__tmp__.swf -o \"%s\"",zip,
+		outputname, preloader, SWFDIR, preloader, outputname);
+#else
+	/* TODO: read out rate */
+	systemf("swfcombine %s -X %d -Y %d -r %f %s/PreLoaderTemplate.swf loader=%s movie=__tmp__.swf -o \"%s\"",zip,width,height,
+		getRate(preloader), preloader, SWFDIR, preloader, outputname);
+#endif
 	systemf("rm __tmp__.swf");
     }
 
-    unlink("/tmp/FontDataBase");
     return 0;
 }
 
-