X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=pdf2swf%2Fpdf2swf.cc;h=79e6cb29ff7b82150aff8117a0f29267422933eb;hb=50777f45c269109a60df757555cf42d7fa236c27;hp=c784f805206d2b1b4fc9d123215af288d8b1dd73;hpb=6b23c562a5018a878151141624c0b6a6619a9e18;p=swftools.git

diff --git a/pdf2swf/pdf2swf.cc b/pdf2swf/pdf2swf.cc
index c784f80..79e6cb2 100644
--- a/pdf2swf/pdf2swf.cc
+++ b/pdf2swf/pdf2swf.cc
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <unistd.h>
 #include "../config.h"
-#include "args.h"
+#include "../lib/args.h"
 #include "pdfswf.h"
 #include "t1lib.h"
 extern "C" {
@@ -66,6 +66,16 @@ 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 (name[0]=='j')
     {
 	if(name[1]) {
@@ -89,39 +99,20 @@ 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"},
+ {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 +140,27 @@ 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;
-}
-
 int main(int argn, char *argv[])
 {
+#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);
@@ -269,6 +198,7 @@ int main(int argn, char *argv[])
 	if(is_in_range(t, pagerange))
 	pdfswf_convertpage(t);
     }
+    pdfswf_performconversion();
 
     pdfswf_close();
     return 0;