X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fpdf2swf.cc;h=10735fdd03371c04583545767bd52580956c56b8;hb=9abb073e374a6ed00605e4e77d5aa6e6184520a7;hp=41ed77d16e23381e2a73e9841c1974c061081b3f;hpb=5e9fbf647b394bf1b3975b0f018958a82677f0d0;p=swftools.git

diff --git a/pdf2swf/pdf2swf.cc b/pdf2swf/pdf2swf.cc
index 41ed77d..10735fd 100644
--- a/pdf2swf/pdf2swf.cc
+++ b/pdf2swf/pdf2swf.cc
@@ -9,6 +9,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdarg.h>
 #include <string.h>
 #include <unistd.h>
 #include "../config.h"
@@ -25,6 +26,22 @@ 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];
+    va_list arglist;
+    va_start(arglist, format);
+    vsprintf(buf, format, arglist);
+    va_end(arglist);
+
+    printf("%s:\n", buf);
+    fflush(stdout);
+    return system(buf);
+}
+
 int args_callback_option(char*name,char*val) {
     if (!strcmp(name, "o"))
     {
@@ -71,6 +88,39 @@ int args_callback_option(char*name,char*val) {
 	pdfswf_linksopennewwindow();
 	return 0;
     }
+    else if (!strcmp(name, "f"))
+    {
+	pdfswf_storeallcharacters();
+	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]) {
@@ -102,6 +152,9 @@ struct options_t options[] =
  {"j","jpegquality"},
  {"p","pages"},
  {"w","samewindow"},
+ {"f","fonts"},
+ {"b","viewer"},
+ {"l","preloader"},
  {0,0}
 };
 
@@ -135,87 +188,21 @@ void args_callback_usage(char*name)
     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("-b  --viewer name	       Link viewer \"name\" to the pdf (\"%s -b\" for list)\n");
+    printf("-l  --preloader name       Link preloader \"name\" to the pdf (\"%s -l\" for list)\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)
@@ -237,10 +224,10 @@ int main(int argn, char *argv[])
     //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);
@@ -263,6 +250,23 @@ int main(int argn, char *argv[])
     pdfswf_performconversion();
 
     pdfswf_close();
+
+    if(!viewer && preloader)
+	logf("<warning> --preloader option without --viewer option doesn't make very much sense.");
+    if(viewer || preloader)
+	printf("\n");
+
+    if(viewer) {
+	systemf("swfcombine `swfdump -XY %s` %s viewport=%s -o %s",
+		outputname, viewer, outputname, outputname);
+	printf("\n");
+    }
+    if(preloader) {
+	systemf("swfcombine `swfdump -r %s` %s/swfs/PreLoaderTemplate.swf loader=%s movie=%s -o %s",
+		preloader, DATADIR, preloader, outputname, outputname);
+	printf("\n");
+    }
+
     return 0;
 }