X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fpdf2swf.cc;h=79e6cb29ff7b82150aff8117a0f29267422933eb;hb=91f07304c9e9687652450f53938d76e1f60ddf76;hp=a99e176159b6ddc8f5f1dc818f9d037a2efa7f90;hpb=bcf7fbf2cd6a7e9ecdfb50ac7bff750c27936c02;p=swftools.git

diff --git a/pdf2swf/pdf2swf.cc b/pdf2swf/pdf2swf.cc
index a99e176..79e6cb2 100644
--- a/pdf2swf/pdf2swf.cc
+++ b/pdf2swf/pdf2swf.cc
@@ -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]) {
@@ -96,6 +106,8 @@ struct options_t options[] =
  {"s","shapes"},
  {"j","jpegquality"},
  {"p","pages"},
+ {"w","samewindow"},
+ {"f","fonts"},
  {0,0}
 };
 
@@ -128,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);
@@ -248,6 +198,7 @@ int main(int argn, char *argv[])
 	if(is_in_range(t, pagerange))
 	pdfswf_convertpage(t);
     }
+    pdfswf_performconversion();
 
     pdfswf_close();
     return 0;