X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fpdf2swf.cc;h=4daa90ae9c5a1aa1130911c13c8ee03bd233fef0;hb=3a0a8b6c989904a4f3ac46738cc7a6d4c19f8a83;hp=c784f805206d2b1b4fc9d123215af288d8b1dd73;hpb=6b23c562a5018a878151141624c0b6a6619a9e18;p=swftools.git

diff --git a/pdf2swf/pdf2swf.cc b/pdf2swf/pdf2swf.cc
index c784f80..4daa90a 100644
--- a/pdf2swf/pdf2swf.cc
+++ b/pdf2swf/pdf2swf.cc
@@ -9,10 +9,11 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdarg.h>
 #include <string.h>
 #include <unistd.h>
 #include "../config.h"
-#include "args.h"
+#include "../lib/args.h"
 #include "pdfswf.h"
 #include "t1lib.h"
 extern "C" {
@@ -25,6 +26,28 @@ static char * pagerange = 0;
 static char * filename = 0;
 static char * password = 0;
 
+static char * preloader = 0;
+static char * viewer = 0;
+
+int systemf(const char* format, ...)
+{
+    char buf[1024];
+    int ret;
+    va_list arglist;
+    va_start(arglist, format);
+    vsprintf(buf, format, arglist);
+    va_end(arglist);
+
+    printf("%s\n", buf);
+    fflush(stdout);
+    ret = system(buf);
+    if(ret) {
+	fprintf(stderr, "system() returned %d\n", ret);
+	exit(ret);
+    }
+    return ret;
+}
+
 int args_callback_option(char*name,char*val) {
     if (!strcmp(name, "o"))
     {
@@ -66,6 +89,58 @@ int args_callback_option(char*name,char*val) {
 	pdfswf_ignoredraworder();
 	return 0;
     }
+    else if (!strcmp(name, "n"))
+    {
+	pdfswf_linksopennewwindow();
+	return 0;
+    }
+    else if (!strcmp(name, "f"))
+    {
+	pdfswf_storeallcharacters();
+	return 0;
+    }
+    else if (!strcmp(name, "l"))
+    {
+	char buf[256];
+	sprintf(buf, "%s/swfs/default_loader.swf", DATADIR);
+	preloader = strdup(buf);
+	return 0;
+    }
+    else if (!strcmp(name, "b"))
+    {
+	char buf[256];
+	sprintf(buf, "%s/swfs/default_viewer.swf", DATADIR);
+	viewer = strdup(buf);
+	return 0;
+    }
+    else if (!strcmp(name, "L"))
+    {
+	if(val)
+	{
+	    preloader = val;
+	}
+	else
+	{
+	    systemf("ls %s/swfs/*_loader.swf", DATADIR);
+	    printf("\n");
+	    exit(1);
+	}
+	return 1;
+    }
+    else if (!strcmp(name, "B"))
+    {
+	if(val)
+	{
+	    viewer = val;
+	}
+	else
+	{
+	    systemf("ls %s/swfs/*_viewer.swf", DATADIR);
+	    printf("\n");
+	    exit(1);
+	}
+	return 1;
+    }
     else if (name[0]=='j')
     {
 	if(name[1]) {
@@ -89,39 +164,24 @@ int args_callback_option(char*name,char*val) {
     return 0;
 }
 
-struct options_t
-{
-    char shortoption;
-    char*longoption;
-} options[] =
-{{'o',"output"},
- {'V',"version"},
- {'i',"ignore"},
- {'s',"shapes"},
- {'j',"jpegquality"},
- {'p',"pages"}
+struct options_t options[] =
+{{"o","output"},
+ {"V","version"},
+ {"i","ignore"},
+ {"s","shapes"},
+ {"j","jpegquality"},
+ {"p","pages"},
+ {"w","samewindow"},
+ {"f","fonts"},
+ {"B","viewer"},
+ {"L","preloader"},
+ {"b","defaultviewer"},
+ {"l","defaultpreloader"},
+ {0,0}
 };
 
 int args_callback_longoption(char*name,char*val) {
-    int t;
-    char*equal = strchr(name,'=');
-    if (equal) {
-	*equal = 0;
-	equal++;
-    }
-    for(t=0;t<sizeof(options)/sizeof(struct options_t);t++) {
-        if(!strcmp(options[t].longoption, name)) {
-		char*tmp = (char*)malloc(strlen(name)+(equal?strlen(equal)+2:2));
-		tmp[0] = options[t].shortoption;
-		tmp[1] = 0;
-		if(equal) {
-		    strcpy(&tmp[1], equal);
-		}
-		return args_callback_option(tmp,val);
-	}
-    }
-    fprintf(stderr, "Unknown option: --%s\n", name);
-    exit(1);
+    return args_long2shortoption(options, name, val);
 }
 
 int args_callback_command(char*name, char*val) {
@@ -149,89 +209,35 @@ void args_callback_usage(char*name)
     printf("-i  --ignore               Ignore draw order (makes the SWF file smaller)\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");
+    printf("-f  --fonts                Store full fonts in SWF. (Don't reduce to used characters)\n");
     printf("-V  --version              Print program version\n");
-}
-
-/* check whether the value t is in a given range.
-  examples: 3 is in range 1-10: true
-            7 is in range 2-4,6,8-10: false
-	    9 is in range 1,2,3-12: true
-*/
-char is_in_range(int t, char*irange)
-{
-    char*pos = irange;
-    char*digits;
-    int num;
-    char range = 0;
-    int last=0;
-    char tmp;
-
-    if(!irange)  // no range resembles (-OO,OO)
-	return 1;
-
-    while(*pos)
-    {
-	while(*pos == ' ' || *pos == '\r' || *pos == '\n' || *pos == '\t')
-	    pos++;
-
-	digits = pos;
-	while(*digits>='0' && *digits<='9')
-	    digits++;
-	if(digits == pos) {
-	    fprintf(stderr, "Error: \"%s\" is not a valid format (digit expected)\n",irange);
-	    exit(1);
-        }
-	
-	tmp=*digits;*digits=0;
-	num = atoi(pos);
-	*digits=tmp;
-	pos = digits;
-
-	while(*pos == ' ' || *pos == '\r' || *pos == '\n' || *pos == '\t')
-	    pos++;
-
-	if(range && last<=t && num>=t)
-	    return 1;
-	if(range) {
-	    range = 0;
-	    if(*pos)
-	     pos ++;
-	    continue;
-	}
-
-	if(*pos=='-')
-	{
-	    if(range) {
-		fprintf(stderr, "Error: \"%s\" is not a valid format (too many '-'s)\n",irange);
-		exit(1);
-	    }
-	    last = num;
-	    range = 1;
-	    if(*pos)
-	     pos ++;
-	    continue;
-	} 
-	else 
-	{
-	    /* if it isn't a '-', we assume it is a seperator like
-	       ',', ';', ':', whatever. */
-	    if(t == num)
-		return 1;
-	    if(*pos)
-	     pos ++;
-	    continue;
-	}
-    }
-    if(range && last<=t)
-	return 1;
-    return 0;
+#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 preloader \"name\" to the pdf (%s/swfs/default_loader.swf)\n", 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);
 }
 
 int main(int argn, char *argv[])
 {
+    int ret;
+#ifdef HAVE_SRAND48
     srand48(time(0));
+#else
+#ifdef HAVE_SRAND
+    srand(time(0));
+#endif
+#endif
     processargs(argn, argv);
     initLog(0,-1,0,0,-1,loglevel);
+    if(!outputname)
+    {
+	fprintf(stderr, "Please use -o to specify an output file\n");
+	exit(1);
+    }
 
     // test if the page range is o.k.
     is_in_range(0x7fffffff, pagerange);
@@ -241,15 +247,15 @@ int main(int argn, char *argv[])
 	exit(0);
     }
 
-    logf("<verbose> reading data files from %s\n", DATADIR);
+    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*fi = fopen("/tmp/t1lib.config.tmp", "wb");
-    fprintf(fi, "FONTDATABASE=%s/FontDataBase\n", DATADIR);
-    fprintf(fi, "ENCODING=%s:.\n", DATADIR);
-    fprintf(fi, "AFM=%s:.\n", DATADIR);
-    fprintf(fi, "TYPE1=%s:.\n", DATADIR);
+    fprintf(fi, "FONTDATABASE=%s/fonts/FontDataBase\n", DATADIR);
+    fprintf(fi, "ENCODING=%s/fonts:.\n", DATADIR);
+    fprintf(fi, "AFM=%s/fonts:.\n", DATADIR);
+    fprintf(fi, "TYPE1=%s/fonts:.\n", DATADIR);
     fclose(fi);
     /* initialize t1lib */
     T1_SetBitmapPad( 16);
@@ -269,8 +275,37 @@ int main(int argn, char *argv[])
 	if(is_in_range(t, pagerange))
 	pdfswf_convertpage(t);
     }
+    pdfswf_performconversion();
 
     pdfswf_close();
+
+    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
+	printf("\n");
+    }
+
+    if(viewer && !preloader) {
+	systemf("swfcombine `swfdump -XY %s` %s viewport=%s -o %s",
+		outputname, viewer, outputname, outputname);
+	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);
+	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);
+	systemf("rm __tmp__.swf");
+    }
+
     return 0;
 }