#endif
#include "../lib/args.h"
#include "SWFOutputDev.h"
-#include "t1lib.h"
-extern "C" {
#include "log.h"
-}
-#include "xpdf/gfile.h"
#ifndef WIN32
#define FONTDIR SWFTOOLS_DATADIR "/fonts"
}
else if (!strcmp(name, "S"))
{
- pdfswf_drawonlyshapes();
+ 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");
return 0;
}
else if (!strcmp(name, "n"))
{
- pdfswf_linksopennewwindow();
+ pdfswf_setparameter("opennewwindow", "1");
return 0;
}
else if (!strcmp(name, "t"))
{
- pdfswf_insertstop();
+ pdfswf_setparameter("insertstop", "1");
return 0;
}
else if (!strcmp(name, "T"))
{
- int i = atoi(val);
if(!strcasecmp(val, "mx"))
- i = 6;
- pdfswf_setversion(i);
+ 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, "F"))
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;
}
}
#endif
printf("-V --version Print program version\n");
printf("\nEnhanced conversion options:\n");
- printf("-t --stop Insert a \"Stop\" Tag in every frame (don't turn pages automatically)\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("-j --jpegquality=quality Set quality of embedded jpeg pictures (default:85)\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, but may produce\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");
printf("Postprocessing options:\n");
#ifndef SYSTEM_BACKTICKS
printf("(They might not work because your system call doesn't support command substitution)\n");
}
#ifdef HAVE_DIRENT_H
-void addfontdir(FILE*database, char* dirname, int*numfonts, char*searchpath)
+static void addfontdir(char* dirname, int*numfonts)
{
- if(searchpath) {
- if(searchpath[0])
- strcat(searchpath, ":");
- strcat(searchpath, dirname);
- }
if(!numfonts)
msg("<verbose> Adding %s to search path\n", dirname);
msg("<warning> Couldn't open directory %s\n", dirname);
return;
}
- dirent*ent;
+ struct dirent*ent;
while(1) {
ent = readdir (dir);
if (!ent)
l=strlen(name);
if(l<4)
continue;
- if(!strncasecmp(&name[l-4], ".afm", 4))
+ if(!strncasecmp(&name[l-4], ".pfa", 4))
type=1;
+ if(!strncasecmp(&name[l-4], ".pfb", 4))
+ type=3;
if(!strncasecmp(&name[l-4], ".ttf", 4))
type=2;
if(type)
{
- if(database && type==1) {
- char buf[256],a;
- FILE*fi;
+ char*fontname = (char*)malloc(strlen(dirname)+strlen(name)+2);
+ strcpy(fontname, dirname);
#ifdef WIN32
- sprintf(buf, "%s\\%s", dirname,name);
+ strcat(fontname, "\\");
#else
- sprintf(buf, "%s/%s", dirname,name);
-#endif
- fi = fopen(buf, "rb");
- if(!fi || !fread(&a,1,1,fi)) {
- msg("<warning> Couldn't read from %s", buf);
- }
-
-#ifdef WIN32
-/* might also work for all other systems, but we *need* it for win32 */
- if(!strncmp(buf, FONTDIR, strlen(FONTDIR)))
- fprintf(database, "%s\n", buf+strlen(FONTDIR));
- else
+ strcat(fontname, "/");
#endif
- fprintf(database, "%s\n", buf);
-
- msg("<verbose> Found font %s\n", buf);
- fclose(fi);
- }
+ strcat(fontname, name);
+ if(!numfonts)
+ msg("<debug> Adding %s to fonts", fontname);
+ pdfswf_addfont(fontname);
if(numfonts)
(*numfonts)++;
}
}
#endif
-char* stripfilename(char*filename, char*newext)
+static char* stripfilename(char*filename, char*newext)
{
char*last1 = strrchr(filename, '/');
char*last2 = strrchr(filename, '\\');
exit(0);
}
- msg("<verbose> reading font files from %s\n", FONTDIR);
- //TODO: use tempnam here. Check if environment already contains a
- //T1LIB_CONFIG.
- char buf1[256],buf2[256],buf3[256];
- char* t1lib_config = mktmpname(buf1);
- char* fontdatabase = mktmpname(buf2);
-
- sprintf(buf3, "T1LIB_CONFIG=%s", t1lib_config);
- putenv(buf3);
-
- FILE*db = fopen(fontdatabase, "wb");
- FILE*fi = fopen(t1lib_config, "wb");
- if(!db || !fi) {
- if(!db) fprintf(stderr, "Couldn't create temporary file %s\n",fontdatabase);
- if(!fi) fprintf(stderr, "Couldn't create temporary file %s\n",t1lib_config);
- exit(1);
- }
- t1searchpath[0] = 0;
#ifdef HAVE_DIRENT_H
// pass 1
- addfontdir(0, FONTDIR, &numfonts, 0);
+ addfontdir(FONTDIR, &numfonts);
for(t=0;t<fontpathpos;t++) {
- addfontdir(0, fontpaths[t], &numfonts,0);
+ addfontdir(fontpaths[t], &numfonts);
}
- fprintf(db, "%d\n", numfonts);
// pass 2
- addfontdir(db, FONTDIR, 0, t1searchpath);
+ addfontdir(FONTDIR, 0);
for(t=0;t<fontpathpos;t++) {
- addfontdir(db, fontpaths[t], 0, t1searchpath);
+ addfontdir(fontpaths[t], 0);
}
#else
-#ifdef WIN32
-#error Win32 version requires dirent.h
-#endif
-/* This is a workaround. The correct way would be to
- get directory listings working on all systems.
-*/
- strcpy(t1searchpath, SWFTOOLS_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");
+ msg("<error> Couldn't find any fonts!");
#endif
- fprintf(fi, "FONTDATABASE=%s\n",fontdatabase);
-#ifndef WIN32
- fprintf(fi, "ENCODING=%s:.\n", t1searchpath);
- fprintf(fi, "AFM=%s:.\n", t1searchpath);
- fprintf(fi, "TYPE1=%s:.\n", t1searchpath);
-#else
- fprintf(fi, "ENCODING=%s\n", FONTDIR);
- fprintf(fi, "AFM=%s\n", FONTDIR);
- fprintf(fi, "TYPE1=%s\n", FONTDIR);
-#endif
- fclose(fi);
- fclose(db);
- /* initialize t1lib */
- T1_SetBitmapPad( 16);
- if ((T1_InitLib(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(t1lib_config);
+ swf_output_t* swf = swf_output_init();
- pdfswf_init(filename, password);
- pdfswf_setoutputfilename(outputname);
-
- int pages = pdfswf_numpages();
- for(t = 1; t <= pages; t++)
+ for(t = 1; t <= pdf->num_pages; t++)
{
- if(is_in_range(t, pagerange))
- pdfswf_convertpage(t);
+ if(is_in_range(t, pagerange)) {
+ /* for links: FIXME */
+ pdfswf_preparepage(t);
+ }
+ if(is_in_range(t, pagerange)) {
+ pdf_page_t*page = pdf_getpage(pdf, t);
+ pdf_page_render(page, swf);
+ pdf_page_destroy(page);
+ }
}
- pdfswf_performconversion();
+ swf_output_save(swf, outputname);
+ swf_output_destroy(swf);
- pdfswf_close();
+ pdf_destroy(pdf);
if(viewer || preloader) {
#ifndef SYSTEM_BACKTICKS
}
if(viewer && !preloader) {
- systemf("swfcombine `swfdump -XY %s` %s viewport=%s -o %s",
+ systemf("swfcombine `swfdump -XY \"%s\"` \"%s\" viewport=\"%s\" -o \"%s\"",
outputname, viewer, outputname, outputname);
if(!system_quiet)
printf("\n");
}
if(preloader && !viewer) {
msg("<warning> --preloader option without --viewer option doesn't make very much sense.");
- ret = systemf("swfcombine `swfdump -r %s` %s/PreLoaderTemplate.swf loader=%s movie=%s -o %s",
+ ret = systemf("swfcombine `swfdump -r \"%s\"` %s/PreLoaderTemplate.swf loader=\"%s\" movie=\"%s\" -o \"%s\"",
preloader, SWFDIR, preloader, outputname, outputname);
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/PreLoaderTemplate.swf loader=%s movie=__tmp__.swf -o %s",
+ systemf("swfcombine `swfdump -XY \"%s\"` `swfdump -r \"%s\"` %s/PreLoaderTemplate.swf loader=%s movie=__tmp__.swf -o \"%s\"",
outputname, preloader, SWFDIR, preloader, outputname);
systemf("rm __tmp__.swf");
}
- unlink(fontdatabase);
return 0;
}
-