X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fpdf2swf.cc;h=39ad03f7d00f740d51038ab1b50b5f725f99f367;hb=c98051785717925e8afb55626f88211b8e7a691d;hp=ed958d17cd72e59a2fd61a2a90050f57cc50ed75;hpb=0a72bdd2dc58cb78b07c29e8b07ecc75b7912880;p=swftools.git

diff --git a/pdf2swf/pdf2swf.cc b/pdf2swf/pdf2swf.cc
index ed958d1..39ad03f 100644
--- a/pdf2swf/pdf2swf.cc
+++ b/pdf2swf/pdf2swf.cc
@@ -48,7 +48,8 @@ static int zlib = 0;
 
 static char * preloader = 0;
 static char * viewer = 0;
-static int nup = 0;
+static int xnup = 1;
+static int ynup = 1;
 
 char* fontpaths[256];
 int fontpathpos = 0;
@@ -90,12 +91,20 @@ int args_callback_option(char*name,char*val) {
     }
     else if (!strcmp(name, "2"))
     {
-        nup = 2;
+        xnup = 2;
+        ynup = 1;
 	return 0;
     }
     else if (!strcmp(name, "4"))
     {
-        nup = 4;
+        xnup = 2;
+        ynup = 2;
+	return 0;
+    }
+    else if (!strcmp(name, "9"))
+    {
+        xnup = 3;
+        ynup = 3;
 	return 0;
     }
     else if (!strcmp(name, "q"))
@@ -178,6 +187,11 @@ int args_callback_option(char*name,char*val) {
 	pdfswf_setparameter("storeallcharacters", "1");
 	return 0;
     }
+    else if (!strcmp(name, "w"))
+    {
+	pdfswf_setparameter("linksopennewwindow", "0");
+	return 0;
+    }
     else if (!strcmp(name, "F"))
     {
 	char *s = strdup(val);
@@ -348,7 +362,7 @@ void args_callback_usage(char*name)
     printf("Postprocessing options:\n");
 #ifndef SYSTEM_BACKTICKS
     printf("(They might not work because your system call doesn't support command substitution)\n");
-#endif
+#endif  
     printf("-b  --defaultviewer        Link default viewer to the pdf (%s)\n", concatPaths(SWFDIR, "default_viewer.swf"));
     printf("-l  --defaultpreloader     Link default preloader the pdf (%s)\n", concatPaths(SWFDIR, "default_loader.swf"));
     printf("-B  --viewer=filename      Link viewer \"name\" to the pdf (\"%s -B\" for list)\n", name);
@@ -425,44 +439,103 @@ int main(int argn, char *argv[])
         msg("<error> Couldn't open %s", filename);
         exit(1);
     }
+
     swf_output_t* swf = swf_output_init();
 
-    for(t = 1; t <= pdf->num_pages; t++) 
+    struct mypage_t {
+	int x;
+	int y;
+	pdf_page_t*page;
+	pdf_page_info_t*info;
+    } pages[4];
+
+    int pagenum = 0;
+    int frame = 1;
+    
+    for(int pagenr = 1; pagenr <= pdf->num_pages; pagenr++) 
+    {
+	if(is_in_range(pagenr, pagerange)) {
+	    swf_output_preparepage(swf, pagenr, frame);
+	    pagenum++;
+	}
+	if(pagenum == xnup*ynup || (pagenr == pdf->num_pages && pagenum>1)) {
+	    pagenum = 0;
+	    frame++;
+	}
+    }
+
+    pagenum = 0;
+
+    for(int pagenr = 1; pagenr <= pdf->num_pages; pagenr++) 
     {
-	if(is_in_range(t, pagerange)) {
-            /* for links: FIXME */
-            pdfswf_preparepage(t);
-        }
-	if(is_in_range(t, pagerange)) {
-            pdf_page_t*page = pdf_getpage(pdf, t);
-            if(nup) {
-                pdf_page_info_t* info = pdf_page_getinfo(page);
-                if(nup_pos%nup == 0) {
-                    pdf_page_render(page, swf);
-                    x = info->xMax;
-                    y = info->yMax;
-                } else if(nup_pos%nup == 1) {
-                    pdf_page_rendersection(page, swf, x, 0, info->xMin+x, info->yMin, info->xMax+x, info->yMax);
-                } else if(nup_pos%nup == 2) {
-                    pdf_page_rendersection(page, swf, 0, y, info->xMin, info->yMin+y, info->xMax, info->yMax+y);
-                } else if(nup_pos%nup == 3) {
-                    pdf_page_rendersection(page, swf, x, y, info->xMin+x, info->yMin+y, info->xMax+x, info->yMax+y);
-                }
-                if(nup_pos % nup == nup-1)
-                    swf_output_pagefeed(swf);
-
-                pdf_page_info_destroy(info);
-            } else {
-                pdf_page_render(page, swf);
-                swf_output_pagefeed(swf);
-            }
-
-            pdf_page_destroy(page);
-        }
-        nup_pos++;
-    }
-    if(!swf_output_save(swf, outputname))
+	if(is_in_range(pagenr, pagerange)) {
+	    pdf_page_t* page = pages[pagenum].page = pdf_getpage(pdf, pagenr);
+            pdf_page_info_t* info = pdf_page_getinfo(page);
+	    pages[pagenum].x = 0;
+	    pages[pagenum].y = 0;
+	    pages[pagenum].info = info;
+	    pages[pagenum].page = page;
+	    pagenum++;
+	}
+	if(pagenum == xnup*ynup || (pagenr == pdf->num_pages && pagenum>1)) {
+
+	    int t;
+	    int xmax[xnup], ymax[xnup];
+	    int x,y;
+	    int width=0, height=0;
+
+	    memset(xmax, 0, xnup*sizeof(int));
+	    memset(ymax, 0, ynup*sizeof(int));
+
+	    for(y=0;y<ynup;y++)
+	    for(x=0;x<xnup;x++) {
+		int t = y*xnup + x;
+
+		if(pages[t].info->xMax-pages[t].info->xMin > xmax[x])
+		    xmax[x] = pages[t].info->xMax-pages[t].info->xMin;
+		if(pages[t].info->yMax-pages[t].info->yMin > ymax[y])
+		    ymax[y] = pages[t].info->yMax-pages[t].info->yMin;
+	    }
+	    for(x=0;x<xnup;x++) {
+		width += xmax[x];
+		xmax[x] = width;
+	    }
+	    for(y=0;y<ynup;y++) {
+		height += ymax[y];
+		ymax[y] = height;
+	    }
+	    swf_output_startframe(swf, width, height);
+	    for(t=0;t<pagenum;t++) {
+		int x = t%xnup;
+		int y = t/xnup;
+		int xpos = x>0?xmax[x-1]:0;
+		int ypos = y>0?ymax[y-1]:0;
+		pdf_page_info_t*info = pages[t].info;
+		xpos -= info->xMin;
+		ypos -= info->yMin;
+		msg("<verbose> Render (%d,%d)-(%d,%d) move:%d/%d\n",
+			info->xMin + xpos,
+			info->yMin + ypos,
+			info->xMax + xpos,
+			info->yMax + ypos, xpos, ypos);
+		pdf_page_rendersection(pages[t].page, swf, xpos, 
+			                                   ypos,
+							   info->xMin + xpos, 
+							   info->yMin + ypos, 
+							   info->xMax + xpos, 
+							   info->yMax + ypos);
+	    }
+	    swf_output_endframe(swf);
+	    for(t=0;t<pagenum;t++)  {
+                pdf_page_info_destroy(pages[t].info);
+		pdf_page_destroy(pages[t].page);
+	    }
+	    pagenum = 0;
+	}
+    }
+    if(swf_output_save(swf, outputname) < 0) {
         exit(1);
+    }
     msg("<notice> SWF written");
     swf_output_destroy(swf);
 
@@ -481,25 +554,60 @@ int main(int argn, char *argv[])
     if(zlib)
 	zip = "-z";
 
+#ifdef _WIN32
+    char*batchname = "_pdf2swf.bat";
+#endif
+
     if(viewer && !preloader) {
+#ifdef _WIN32
+	system_quiet=1;
+	systemf("echo swfcombine %s \"%s\" viewport=\"%s\" -o \"%s\" ^^>%s",zip,
+		viewer, outputname, outputname, batchname);
+	systemf("swfdump -XY \"%s\">>%s", outputname, batchname);
+	systemf("call %s", batchname);
+	systemf("del %s", batchname);
+#else
 	systemf("swfcombine %s `swfdump -XY \"%s\"` \"%s\" viewport=\"%s\" -o \"%s\"",zip,
 		outputname, viewer, outputname, outputname);
+#endif
 	if(!system_quiet)
 	    printf("\n");
     }
     if(preloader && !viewer) {
 	msg("<warning> --preloader option without --viewer option doesn't make very much sense.");
-	ret = systemf("swfcombine %s `swfdump -r \"%s\"` %s/PreLoaderTemplate.swf loader=\"%s\" movie=\"%s\" -o \"%s\"",zip,
+#ifdef _WIN32
+	system_quiet=1;
+	systemf("echo @SET RATE=^^>%s", batchname);
+	systemf("swfdump -r \"%s\">>%s", preloader, batchname);
+	systemf("echo swfcombine %s %s\\PreLoaderTemplate.swf loader=\"%s\" movie=\"%s\" -o \"%s\" %%RATE%%>>%s",zip,
+		SWFDIR, preloader, outputname, outputname, batchname);
+	systemf("call %s", batchname);
+	systemf("del %s", batchname);
+#else
+	systemf("swfcombine %s `swfdump -r \"%s\"` %s/PreLoaderTemplate.swf loader=\"%s\" movie=\"%s\" -o \"%s\"",zip,
 		preloader, SWFDIR, preloader, outputname, outputname);
+#endif
 	if(!system_quiet)
 	    printf("\n");
     }
     if(preloader && viewer) {
 	systemf("swfcombine \"%s\" viewport=%s -o __tmp__.swf",
-		viewer, outputname, outputname);
+		viewer, outputname);
+#ifdef _WIN32
+	system_quiet=1;
+	systemf("echo @SET X_AND_Y=^^>%s", batchname);
+	systemf("swfdump -XY \"%s\">>%s", outputname, batchname);
+	systemf("echo @SET RATE=^^>>%s", batchname);
+	systemf("swfdump -r \"%s\">>%s", preloader, batchname);
+	systemf("echo swfcombine %s %%X_AND_Y%% %%RATE%% %s\\PreLoaderTemplate.swf loader=%s movie=__tmp__.swf -o \"%s\">>%s",zip,
+		SWFDIR, preloader, outputname, batchname);
+	systemf("call %s", batchname);
+	systemf("del __tmp__.swf %s", batchname);
+#else
 	systemf("swfcombine %s `swfdump -XY \"%s\"` `swfdump -r \"%s\"` %s/PreLoaderTemplate.swf loader=%s movie=__tmp__.swf -o \"%s\"",zip,
 		outputname, preloader, SWFDIR, preloader, outputname);
 	systemf("rm __tmp__.swf");
+#endif
     }
 
     return 0;