X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fpdf2swf.cc;h=cff67d0e48ad9edda23c8a4bccbcaefe9c1787ea;hb=5ede6209244433ea174111a9079fa6d0cf84d227;hp=8acd224e86eea8abdaf5663f729de8d8c09272c9;hpb=21e018742051f8a032fa50117ba5beb0668c25f0;p=swftools.git diff --git a/pdf2swf/pdf2swf.cc b/pdf2swf/pdf2swf.cc index 8acd224..cff67d0 100644 --- a/pdf2swf/pdf2swf.cc +++ b/pdf2swf/pdf2swf.cc @@ -17,7 +17,7 @@ #include #endif #include "../lib/args.h" -#include "pdfswf.h" +#include "SWFOutputDev.h" #include "t1lib.h" extern "C" { #include "log.h" @@ -35,6 +35,8 @@ static char * viewer = 0; char* fontpaths[256]; int fontpathpos = 0; +static int system_quiet=0; + int systemf(const char* format, ...) { char buf[1024]; @@ -44,8 +46,10 @@ int systemf(const char* format, ...) vsprintf(buf, format, arglist); va_end(arglist); - printf("%s\n", buf); - fflush(stdout); + if(!system_quiet) { + printf("%s\n", buf); + fflush(stdout); + } ret = system(buf); if(ret) { fprintf(stderr, "system() returned %d\n", ret); @@ -65,6 +69,12 @@ int args_callback_option(char*name,char*val) { loglevel ++; return 0; } + else if (!strcmp(name, "q")) + { + loglevel --; + system_quiet = 1; + return 0; + } else if (name[0]=='p') { /* check whether the page range follows the p directly, like @@ -87,6 +97,19 @@ int args_callback_option(char*name,char*val) { } else if (!strcmp(name, "s")) { + 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_drawonlyshapes(); return 0; } @@ -105,6 +128,19 @@ int args_callback_option(char*name,char*val) { pdfswf_linksopennewwindow(); return 0; } + else if (!strcmp(name, "t")) + { + pdfswf_insertstop(); + return 0; + } + else if (!strcmp(name, "T")) + { + int i = atoi(val); + if(!strcasecmp(val, "mx")) + i = 6; + pdfswf_setversion(i); + return 1; + } else if (!strcmp(name, "f")) { pdfswf_storeallcharacters(); @@ -124,14 +160,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/swfs/default_loader.swf", SWFTOOLS_DATADIR); preloader = strdup(buf); return 0; } else if (!strcmp(name, "b")) { char buf[256]; - sprintf(buf, "%s/swfs/default_viewer.swf", DATADIR); + sprintf(buf, "%s/swfs/default_viewer.swf", SWFTOOLS_DATADIR); viewer = strdup(buf); return 0; } @@ -143,8 +179,9 @@ int args_callback_option(char*name,char*val) { } else { - systemf("ls %s/swfs/*_loader.swf", DATADIR); - printf("\n"); + systemf("ls %s/swfs/*_loader.swf", SWFTOOLS_DATADIR); + if(!system_quiet) + printf("\n"); exit(1); } return 1; @@ -157,13 +194,14 @@ int args_callback_option(char*name,char*val) { } else { - systemf("ls %s/swfs/*_viewer.swf", DATADIR); - printf("\n"); + systemf("ls %s/swfs/*_viewer.swf", SWFTOOLS_DATADIR); + 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])); @@ -186,21 +224,42 @@ int args_callback_option(char*name,char*val) { return 0; } +/*struct docoptions_t options[] = +{{"o","output","filename::Specify output file"}, + {"V","version","Print program version"}, + {"i","ignore","Ignore draw order (makes the SWF file smaller, but may produce graphic errors)"}, + {"z","zlib","Use Flash 6 (MX) zlib compression (Needs at least Flash 6 Plugin to play)"}, + {"s","shapes","Don't use SWF Fonts, but store everything as shape"}, + {"j","jpegquality","Set quality of embedded jpeg pictures (default: 85)"}, + {"p","pages","Convert only pages in range. (E.g. 3-85)"}, + {"w","samewindow","Don't open a new browser window for links in the SWF"}, + {"f","fonts","Stroe full fonts in SWF. (Don't reduce to used characters)"}, + {"F","fontpath","path::Add directory to font search path"}, + {"B","viewer","name::Link viewer \"name\" to the pdf"}, + {"L","preloader","file.swf::Link preloader \"file.swf\" to the pdf"}, + {"b","defaultviewer","Link default viewer to the pdf"}, + {"l","defaultpreloader","Link default preloader to the pdf"} + {0,0} +};*/ struct options_t options[] = {{"o","output"}, + {"q","quiet"}, {"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} }; @@ -225,27 +284,35 @@ 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 [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("-w --samewindow Don't open a new Browser Window for Links in the SWF\n"); -#ifdef HAVE_DIRENT + printf("-q --quiet Suppress normal messages. Use -qq to suppress warnings, also.\n"); +#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"); + 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 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" + " graphic errors)\n"); + printf("Postprocessing options:\n"); #ifndef SYSTEM_BACKTICKS - printf("The following might not work because your system call doesn't support command substitution:\n"); + printf("(They 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 preloader \"name\" to the pdf (%s/swfs/default_loader.swf)\n", DATADIR); + printf("-b --defaultviewer Link default viewer to the pdf (%s/swfs/default_viewer.swf)\n", SWFTOOLS_DATADIR); + printf("-l --defaultpreloader Link default preloader the pdf (%s/swfs/default_loader.swf)\n", SWFTOOLS_DATADIR); 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); } @@ -293,6 +360,7 @@ void addfontdir(FILE*database, char* dirname, int*numfonts, char*searchpath) } fprintf(database, "%s\n", buf); logf(" Found font %s\n", buf); + fclose(fi); } if(numfonts) (*numfonts)++; @@ -302,6 +370,25 @@ void addfontdir(FILE*database, char* dirname, int*numfonts, char*searchpath) } #endif +char* stripfilename(char*filename, char*newext) +{ + char*last1 = strrchr(filename, '/'); + char*last2 = strrchr(filename, '\\'); + char*pos = filename; + char*name; + char*dot; + if(last1>pos) pos = last1 + 1; + if(last2>pos) pos = last2 + 1; + name = (char*)malloc(strlen(pos)+5); + strcpy(name, pos); + dot = strrchr(name, '.'); + if(dot) { + *dot = 0; + } + strcat(name, newext); + return name; +} + int main(int argn, char *argv[]) { int ret; @@ -318,6 +405,21 @@ int main(int argn, char *argv[]) #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"); + logf(" Output filename not given. Writing to %s", outputname); + } + } + if(!outputname) { fprintf(stderr, "Please use -o to specify an output file\n"); @@ -332,7 +434,7 @@ int main(int argn, char *argv[]) exit(0); } - logf(" reading font files from %s/fonts\n", DATADIR); + logf(" reading font files from %s/fonts\n", SWFTOOLS_DATADIR); //TODO: use tempnam here. Check if environment already contains a //T1LIB_CONFIG. putenv( "T1LIB_CONFIG=/tmp/t1lib.config.tmp"); @@ -344,7 +446,7 @@ int main(int argn, char *argv[]) } t1searchpath[0] = 0; #ifdef HAVE_DIRENT_H - sprintf(buf, "%s/fonts",DATADIR); + sprintf(buf, "%s/fonts",SWFTOOLS_DATADIR); // pass 1 addfontdir(0, buf, &numfonts, 0); for(t=0;t Not sure whether system() can handle command substitution"); logf(" (According to config.h, it can't)"); #endif - printf("\n"); + if(!system_quiet) + printf("\n"); } if(viewer && !preloader) { systemf("swfcombine `swfdump -XY %s` %s viewport=%s -o %s", outputname, viewer, outputname, outputname); - printf("\n"); + if(!system_quiet) + printf("\n"); } if(preloader && !viewer) { logf(" --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); - printf("\n"); + preloader, SWFTOOLS_DATADIR, preloader, outputname, outputname); + if(!system_quiet) + printf("\n"); } if(preloader && viewer) { 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); + outputname, preloader, SWFTOOLS_DATADIR, preloader, outputname); systemf("rm __tmp__.swf"); }