From 65780a7ef9a0b237d620265b3f712a535d288460 Mon Sep 17 00:00:00 2001
From: Ravi Pratap <ravi@che.iitm.ac.in>
Date: Sun, 12 Aug 2001 14:11:25 +0000
Subject: [PATCH] Add ZoomFitHeight verb and toolbar item.

2001-08-12  Ravi Pratap  <ravi@che.iitm.ac.in>

	* xpdf/bonobo-application-x-pdf-ui.xml : Add ZoomFitHeight verb and toolbar
	item.

	* xpdf/bonobo-application-x-pdf.h (VERB_Z_FIT): Rename to VERB_Z_FIT_WIDTH
	(VERB_Z_FIT_HEIGHT): Add

	* xpdf/bonobo-application-x-pdf.cc (verbs): Update to use the new
	verbs and names.
	(view_zoom_verb): update accordingly
	(zoom_to_fit): Modify to take an extra argument determining type of fit. Use
	the scrolled_window to determine allocation height and width.

	* xpdf/Makefile.am : Comment out unnecessary targets

2001-08-10  Ravi Pratap  <ravi@che.iitm.ac.in>

	* xpdf/stock-zoom-in.xpm : Add

	* xpdf/stock-zoom-out.xpm : Add

	* xpdf/stock-zoom-fit.xpm : Add

	* xpdf/stock-zoom-fit-wide.xpm : Add

	* xpdf/stock-zoom-fit-tall.xpm : Add

	* xpdf/Makefile.am : Update, add targets etc.

	* xpdf/bonobo-application-x-pdf.cc (view_zoom_verb): Change zoom
	factor to 1.2 which is more correct
	(zoom_to_fit): Small tweak to enable better approximation

	* xpdf/bonobo-application-x-pdf-ui.xml : Change ZoomFit to ZoomFitWidth.

	* xpdf/bonobo-application-x-pdf.cc : Update to use the new name.

2001-08-09  Ravi Pratap  <ravi@che.iitm.ac.in>

	* xpdf/bonobo-application-pdf-ui.xml: Add Zoom items to the
	toolbar

2001-07-10  Ravi Pratap  <ravi@che.iitm.ac.in>

	* xpdf/gpdf.cc (main): Make indentation consistent with the
	rest of the source

2001-07-01  Ravi Pratap  <ravi@che.iitm.ac.in>

	* xpdf/gpdf-ui.xml: Make the print menu item visible.
---
 pdf/xpdf/Makefile.am                | 108 ++++++++-------
 pdf/xpdf/bonobo-application-x-pdf.h |   4 +-
 pdf/xpdf/gpdf-ui.xml                |   8 +-
 pdf/xpdf/gpdf.cc                    |  84 ++++++------
 pdf/xpdf/stock-zoom-fit-tall.xpm    | 158 ++++++++++++++++++++++
 pdf/xpdf/stock-zoom-fit-wide.xpm    | 158 ++++++++++++++++++++++
 pdf/xpdf/stock-zoom-fit.xpm         | 181 +++++++++++++++++++++++++
 pdf/xpdf/stock-zoom-in.xpm          | 190 ++++++++++++++++++++++++++
 pdf/xpdf/stock-zoom-out.xpm         | 203 ++++++++++++++++++++++++++++
 9 files changed, 996 insertions(+), 98 deletions(-)
 create mode 100644 pdf/xpdf/stock-zoom-fit-tall.xpm
 create mode 100644 pdf/xpdf/stock-zoom-fit-wide.xpm
 create mode 100644 pdf/xpdf/stock-zoom-fit.xpm
 create mode 100644 pdf/xpdf/stock-zoom-in.xpm
 create mode 100644 pdf/xpdf/stock-zoom-out.xpm

diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am
index b4ea2eda..dec83249 100644
--- a/pdf/xpdf/Makefile.am
+++ b/pdf/xpdf/Makefile.am
@@ -12,11 +12,11 @@ else
 gui = xpdf
 endif
 
-bin_PROGRAMS =			\
-	pdftops pdftotext	\
-	pdfinfo	pdftopbm	\
-	pdfimages $(gui)	\
-	bonobo-application-x-pdf
+bin_PROGRAMS = 	$(gui)	bonobo-application-x-pdf
+#	pdftops pdftotext	
+#	pdfinfo	pdftopbm	
+#	pdfimages  		
+
 
 common_sources =		\
 	Array.cc 		\
@@ -108,57 +108,63 @@ xpdf_SOURCES =			\
 xpdf_CFLAGS = $(X_CFLAGS)
 xpdf_LDADD = ../goo/libgoo.a ../ltk/libltk.a -lXpm $(EXTRA_GNOME_LIBS) 
 
-pdfimages_SOURCES =		\
-	$(common_sources)	\
-	ImageOutputDev.cc	\
-	ImageOutputDev.h	\
-	pdfimages.cc
-
-pdfimages_LDADD = ../goo/libgoo.a
-
-pdftops_SOURCES =		\
-	$(common_sources)	\
-	PSOutputDev.cc		\
-	pdftops.cc
-pdftops_LDADD = ../goo/libgoo.a
-
-pdftotext_SOURCES =		\
-	$(common_sources)	\
-	pdftotext.cc
-pdftotext_LDADD = ../goo/libgoo.a
-
-pdfinfo_SOURCES =		\
-	$(common_sources)	\
-	pdfinfo.cc
-pdfinfo_LDADD = ../goo/libgoo.a
-
-pdftopbm_SOURCES =		\
-	$(common_sources)	\
-	PBMOutputDev.cc		\
-	PBMOutputDev.h		\
-	XOutputDev.cc		\
-	XOutputDev.h		\
-	XOutputFontInfo.h	\
-	pdftopbm.cc
-
-pdftopbm_LDADD = ../goo/libgoo.a $(EXTRA_GNOME_LIBS)
+#pdfimages_SOURCES =		
+#	$(common_sources)	
+#	ImageOutputDev.cc	
+#	ImageOutputDev.h	
+#	pdfimages.cc
+
+#pdfimages_LDADD = ../goo/libgoo.a
+#
+#pdftops_SOURCES =		
+#	$(common_sources)	
+#	PSOutputDev.cc		
+#       pdftops.cc
+#pdftops_LDADD = ../goo/libgoo.a
+
+#pdftotext_SOURCES =		
+#	$(common_sources)	
+#	pdftotext.cc
+#pdftotext_LDADD = ../goo/libgoo.a
+
+#pdfinfo_SOURCES =		
+#	$(common_sources)	
+#	pdfinfo.cc
+#pdfinfo_LDADD = ../goo/libgoo.a
+
+#pdftopbm_SOURCES =		
+#	$(common_sources)	
+#	PBMOutputDev.cc		
+#	PBMOutputDev.h		
+#	XOutputDev.cc		
+#	XOutputDev.h		
+#	XOutputFontInfo.h	
+#	pdftopbm.cc
+
+#pdftopbm_LDADD = ../goo/libgoo.a $(EXTRA_GNOME_LIBS)
 
 xpdf-ltk.h: xpdf.ltk
 	rm -f $@
 	$(top_srcdir)/ltk/ltkbuild <xpdf.ltk >$@.new
 	mv $@.new $@
 
-bitmaps =			\
-	about.xbm		\
-	dblLeftArrow.xbm	\
-	dblRightArrow.xbm	\
-	find.xbm		\
-	leftArrow.xbm		\
-	postscript.xbm		\
-	rightArrow.xbm		\
-	xpdfIcon.xpm		\
-	zoomIn.xbm		\
-	zoomOut.xbm		
+#bitmaps =		
+#	about.xbm		
+#	dblLeftArrow.xbm	
+#	dblRightArrow.xbm	
+#	find.xbm		
+#	leftArrow.xbm		
+#	postscript.xbm		
+#	rightArrow.xbm		
+#	xpdfIcon.xpm		
+#	zoomIn.xbm		
+#	zoomOut.xbm		
+
+
+stockdir = $(datadir)/pixmaps/gpdf
+stock_DATA = stock-zoom-in.xpm	stock-zoom-out.xpm \
+	     stock-zoom-fit.xpm stock-zoom-fit-wide.xpm	\
+	     stock-zoom-fit-tall.xpm	
 
 ltk = 			\
 	xpdf-flip.ltk	\
@@ -175,7 +181,7 @@ XML_FILES =				\
 uidir = $(datadir)/gnome/ui
 ui_DATA = $(XML_FILES)
 
-EXTRA_DIST = $(bitmaps) ChangeLog $(ltk)	\
+EXTRA_DIST = $(stock_DATA) ChangeLog $(ltk)	\
              $(oaf_DATA) config.h $(XML_FILES)
 
 
diff --git a/pdf/xpdf/bonobo-application-x-pdf.h b/pdf/xpdf/bonobo-application-x-pdf.h
index 01668ab6..66b4ee43 100644
--- a/pdf/xpdf/bonobo-application-x-pdf.h
+++ b/pdf/xpdf/bonobo-application-x-pdf.h
@@ -10,8 +10,10 @@
 #define VERB_PREV  "PrevPage"
 #define VERB_NEXT  "NextPage"
 #define VERB_LAST  "LastPage"
-#define VERB_Z_FIT "ZoomFit"
+
 #define VERB_Z_IN  "ZoomIn"
 #define VERB_Z_OUT "ZoomOut"
+#define VERB_Z_FIT_WIDTH  "ZoomFitWidth"
+#define VERB_Z_FIT_HEIGHT "ZoomFitHeight"
 
 #endif /* BONOBOAPPLICATIONXPDF_H */
diff --git a/pdf/xpdf/gpdf-ui.xml b/pdf/xpdf/gpdf-ui.xml
index 6424ff90..7a52076a 100644
--- a/pdf/xpdf/gpdf-ui.xml
+++ b/pdf/xpdf/gpdf-ui.xml
@@ -12,11 +12,11 @@
            pixtype="stock" pixname="Exit" accel="*Control*q"/>
 
         <cmd name="FilePrint" _label="Print"
-	_tip="Print the current file" pixtype="stock" pixname="Print" hidden="1"/>
+	_tip="Print the current file" pixtype="stock" pixname="Print" hidden="0"/>
 	
         <cmd name="FilePrintSetup" _label="Print Setup"
           _tip="Setup the page settings for your current printer"
-	  pixtype="stock" pixname="Print" hidden="1"/>
+	  pixtype="stock" pixname="Print" hidden="0"/>
 
         <cmd name="HelpAbout" _label="About..." _tip="About this application"
 	 pixtype="stock" pixname="About"/>
@@ -69,8 +69,8 @@
 <dockitem name="Toolbar" behavior="exclusive">
 
 	<toolitem name="open" verb="FileOpen"/>
-
-	<separator/>
+        <toolitem name="print" verb="FilePrint"/>
+        <separator/>
 
 </dockitem>
 
diff --git a/pdf/xpdf/gpdf.cc b/pdf/xpdf/gpdf.cc
index aa44c4eb..7286c4af 100644
--- a/pdf/xpdf/gpdf.cc
+++ b/pdf/xpdf/gpdf.cc
@@ -49,7 +49,7 @@ struct  _Component {
 	Container	  *container;
 
 	BonoboClientSite   *client_site;
-	BonoboViewFrame	  *view_frame;
+	BonoboViewFrame	   *view_frame;
 	BonoboObjectClient *server;
 };
 
@@ -534,46 +534,46 @@ container_new (const char *fname)
 int
 main (int argc, char **argv)
 {
-  CORBA_Environment ev;
-  CORBA_ORB         orb;
-  const char      **view_files = NULL;
-  gboolean          loaded;
-  int               i;
-  
-  CORBA_exception_init (&ev);
-  
-
-  gnomelib_register_popt_table (oaf_popt_options, "OAF");
-  gnome_init_with_popt_table("PDFViewer", "0.0.1",
-			     argc, argv,
-			     gpdf_popt_options, 0, &ctx); 
-  orb = oaf_init (argc, argv);
-
-  CORBA_exception_free (&ev);
-
-  if (bonobo_init (orb, NULL, NULL) == FALSE)
-    g_error (_("Could not initialize Bonobo!\n"));
-  bonobo_activate ();
-
-  view_files = poptGetArgs (ctx);
-
-  /* Load files */
-  i = 0;
-  loaded = FALSE;
-  if (view_files) {
-    for (i = 0; view_files[i]; i++)
-      if (container_new (view_files[i])) {
-	loaded = TRUE;
-	while (gtk_events_pending ())
-	  gtk_main_iteration ();
-      }
-  }
-  if ((i == 0) || !loaded)
-    container_new (NULL);
-  
-  poptFreeContext (ctx);
-
-  gtk_main ();
+	CORBA_Environment ev;
+	CORBA_ORB         orb;
+	const char      **view_files = NULL;
+	gboolean          loaded;
+	int               i;
+	
+	CORBA_exception_init (&ev);
+	
+	
+	gnomelib_register_popt_table (oaf_popt_options, "OAF");
+	gnome_init_with_popt_table("PDFViewer", "0.0.1",
+				   argc, argv,
+				   gpdf_popt_options, 0, &ctx); 
+	orb = oaf_init (argc, argv);
+	
+	CORBA_exception_free (&ev);
+	
+	if (bonobo_init (orb, NULL, NULL) == FALSE)
+		g_error (_("Could not initialize Bonobo!\n"));
+	bonobo_activate ();
+	
+	view_files = poptGetArgs (ctx);
+	
+	/* Load files */
+	i = 0;
+	loaded = FALSE;
+	if (view_files) {
+		for (i = 0; view_files[i]; i++)
+			if (container_new (view_files[i])) {
+				loaded = TRUE;
+				while (gtk_events_pending ())
+					gtk_main_iteration ();
+			}
+	}
+	if ((i == 0) || !loaded)
+		container_new (NULL);
+	
+	poptFreeContext (ctx);
+	
+	gtk_main ();
 	
-  return 0;
+	return 0;
 }
diff --git a/pdf/xpdf/stock-zoom-fit-tall.xpm b/pdf/xpdf/stock-zoom-fit-tall.xpm
new file mode 100644
index 00000000..ee1b0494
--- /dev/null
+++ b/pdf/xpdf/stock-zoom-fit-tall.xpm
@@ -0,0 +1,158 @@
+/* XPM */
+static char * stock_zoom_fit_tall_xpm[] = {
+"24 24 131 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #30302D",
+"@ 	c #7E7E75",
+"# 	c #B3B3A5",
+"$ 	c #CFCFBE",
+"% 	c #D2D2C1",
+"& 	c #BABAAA",
+"* 	c #848479",
+"= 	c #31312D",
+"- 	c #87877F",
+"; 	c #D7D7CC",
+"> 	c #DADACD",
+", 	c #DADACC",
+"' 	c #DADACB",
+") 	c #DCDCCC",
+"! 	c #DFDFCF",
+"~ 	c #DEDECD",
+"{ 	c #D9D9C8",
+"] 	c #7E7E73",
+"^ 	c #A6A69D",
+"/ 	c #E2E2D9",
+"( 	c #E9E9E2",
+"_ 	c #EAEAE2",
+": 	c #E6E6DB",
+"< 	c #E3E3D5",
+"[ 	c #E3E3D3",
+"} 	c #DFDFCE",
+"| 	c #D9D9C7",
+"1 	c #D4D4C3",
+"2 	c #929285",
+"3 	c #86867E",
+"4 	c #E0E0D8",
+"5 	c #EAEADF",
+"6 	c #E2E2D4",
+"7 	c #C4C4B4",
+"8 	c #717168",
+"9 	c #30302C",
+"0 	c #D6D6CA",
+"a 	c #E7E7DF",
+"b 	c #C6C6B5",
+"c 	c #BFBFAE",
+"d 	c #B9B9AA",
+"e 	c #282824",
+"f 	c #D9D9CC",
+"g 	c #E6E6DD",
+"h 	c #F9F9F5",
+"i 	c #C8C8B9",
+"j 	c #B9B9A9",
+"k 	c #B4B4A4",
+"l 	c #68685F",
+"m 	c #B3B3A6",
+"n 	c #E4E4D8",
+"o 	c #EFEFE6",
+"p 	c #C3C3B3",
+"q 	c #B3B3A4",
+"r 	c #AEAE9F",
+"s 	c #909083",
+"t 	c #D1D1C0",
+"u 	c #DBDBCC",
+"v 	c #E8E8DB",
+"w 	c #E6E6DA",
+"x 	c #E2E2D5",
+"y 	c #BDBDAD",
+"z 	c #B8B8A8",
+"A 	c #B3B3A3",
+"B 	c #A9A99A",
+"C 	c #A1A192",
+"D 	c #D5D5C3",
+"E 	c #E2E2D1",
+"F 	c #DBDBCB",
+"G 	c #D6D6C7",
+"H 	c #B7B7A8",
+"I 	c #B2B2A3",
+"J 	c #ADAD9E",
+"K 	c #A8A899",
+"L 	c #A3A395",
+"M 	c #9B9B8D",
+"N 	c #BDBDAE",
+"O 	c #DBDBCA",
+"P 	c #CDCDBD",
+"Q 	c #B2B2A2",
+"R 	c #A3A394",
+"S 	c #9E9E8F",
+"T 	c #828275",
+"U 	c #DADAC8",
+"V 	c #D5D5C4",
+"W 	c #ACAC9D",
+"X 	c #9D9D8F",
+"Y 	c #98988A",
+"Z 	c #57574F",
+"` 	c #989889",
+" .	c #1F1F1C",
+"..	c #7B7B71",
+"+.	c #CACAB9",
+"@.	c #B0B0A1",
+"#.	c #ABAB9C",
+"$.	c #929284",
+"%.	c #53534B",
+"&.	c #8D8D82",
+"*.	c #BFBFAF",
+"=.	c #B5B5A5",
+"-.	c #B0B0A0",
+";.	c #A6A697",
+">.	c #9C9C8D",
+",.	c #969689",
+"'.	c #919184",
+").	c #65655C",
+"!.	c #6E6E65",
+"~.	c #B4B4A5",
+"{.	c #AFAFA0",
+"].	c #AAAA9B",
+"^.	c #A5A596",
+"/.	c #A0A092",
+"(.	c #969688",
+"_.	c #919183",
+":.	c #241D14",
+"<.	c #211100",
+"[.	c #262623",
+"}.	c #8C8C80",
+"|.	c #9D9D8E",
+"1.	c #7F7F74",
+"2.	c #55554E",
+"3.	c #E9D1B8",
+"4.	c #A6825C",
+"5.	c #582D00",
+"6.	c #0B0600",
+"7.	c #160B00",
+"8.	c #4D2800",
+"9.	c #371C00",
+"0.	c #372B1F",
+"              . . . . . .                       ",
+"          . . . . . . . . . .                   ",
+"        . . + @ # $ % & * = . .                 ",
+"      . . - ; > , ' ) ! ~ { ] . .               ",
+"    . . ^ / ( _ : < [ } | 1 $ 2 . .             ",
+"  . . 3 4 . . . . 5 6 . . . . 7 8 . .           ",
+"  . 9 0 a . b b . . . . b b . c d e .           ",
+". . @ f g . b h . . . . i b . j k l . .         ",
+". . m , n . b o . . . . p b . q r s . .         ",
+". . t u 6 v w x . . . . y z A r B C . .         ",
+". . D } E ! F G . . . . H I J K L M . .         ",
+". . N } O . b P . . . . Q b . R S T . .         ",
+". . * U V . b b . . . . W b . X Y Z . .         ",
+"  . 9 1 $ . b b . . . . b b . ` 2  ..           ",
+"  . . ..+.. . . . @.#.. . . . $.%.. .           ",
+"    . . &.*.& =.-.#.;.C >.,.'.).. . .           ",
+"      . . !.~.{.].^./.M (._.%.. . :.<..         ",
+"        . . [.).}.|.` 1.2. .. . :.3.4.5.6.      ",
+"          . . . . . . . . . . . 7.4.3.4.5.6.    ",
+"              . . . . . .       . 8.4.3.4.5..   ",
+"                                  6.5.4.3.4.9.. ",
+"                                    6.5.4.3.4.. ",
+"                                      6.8.4.3.. ",
+"                                        . 7.0.. "};
diff --git a/pdf/xpdf/stock-zoom-fit-wide.xpm b/pdf/xpdf/stock-zoom-fit-wide.xpm
new file mode 100644
index 00000000..2bcd52b4
--- /dev/null
+++ b/pdf/xpdf/stock-zoom-fit-wide.xpm
@@ -0,0 +1,158 @@
+/* XPM */
+static char * stock_zoom_fit_wide_xpm[] = {
+"24 24 130 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #30302D",
+"@ 	c #7E7E75",
+"# 	c #B3B3A5",
+"$ 	c #CFCFBE",
+"% 	c #D2D2C1",
+"& 	c #BABAAA",
+"* 	c #848479",
+"= 	c #31312D",
+"- 	c #87877F",
+"; 	c #D7D7CC",
+"> 	c #DADACD",
+", 	c #DADACC",
+"' 	c #DADACB",
+") 	c #DCDCCC",
+"! 	c #DFDFCF",
+"~ 	c #DEDECD",
+"{ 	c #D9D9C8",
+"] 	c #7E7E73",
+"^ 	c #A6A69D",
+"/ 	c #E2E2D9",
+"( 	c #E9E9E2",
+"_ 	c #EAEAE2",
+": 	c #E6E6DB",
+"< 	c #E3E3D5",
+"[ 	c #E3E3D3",
+"} 	c #DFDFCE",
+"| 	c #D9D9C7",
+"1 	c #D4D4C3",
+"2 	c #929285",
+"3 	c #86867E",
+"4 	c #E0E0D8",
+"5 	c #EAEADF",
+"6 	c #E2E2D4",
+"7 	c #C4C4B4",
+"8 	c #717168",
+"9 	c #30302C",
+"0 	c #D6D6CA",
+"a 	c #E7E7DF",
+"b 	c #C6C6B5",
+"c 	c #DFDFD0",
+"d 	c #BFBFAE",
+"e 	c #B9B9AA",
+"f 	c #282824",
+"g 	c #D9D9CC",
+"h 	c #E6E6DD",
+"i 	c #F9F9F5",
+"j 	c #F0F0E9",
+"k 	c #E4E4D9",
+"l 	c #D9D9CA",
+"m 	c #D0D0C0",
+"n 	c #C8C8B9",
+"o 	c #B9B9A9",
+"p 	c #B4B4A4",
+"q 	c #68685F",
+"r 	c #B3B3A6",
+"s 	c #E4E4D8",
+"t 	c #B3B3A4",
+"u 	c #AEAE9F",
+"v 	c #909083",
+"w 	c #D1D1C0",
+"x 	c #DBDBCC",
+"y 	c #E8E8DB",
+"z 	c #B3B3A3",
+"A 	c #A9A99A",
+"B 	c #A1A192",
+"C 	c #D5D5C3",
+"D 	c #E2E2D1",
+"E 	c #ADAD9E",
+"F 	c #A8A899",
+"G 	c #A3A395",
+"H 	c #9B9B8D",
+"I 	c #BDBDAE",
+"J 	c #DBDBCA",
+"K 	c #A3A394",
+"L 	c #9E9E8F",
+"M 	c #828275",
+"N 	c #DADAC8",
+"O 	c #D5D5C4",
+"P 	c #C1C1B0",
+"Q 	c #BBBBAC",
+"R 	c #B6B6A7",
+"S 	c #B1B1A2",
+"T 	c #ACAC9D",
+"U 	c #9D9D8F",
+"V 	c #98988A",
+"W 	c #57574F",
+"X 	c #B6B6A6",
+"Y 	c #B1B1A1",
+"Z 	c #989889",
+"` 	c #1F1F1C",
+" .	c #7B7B71",
+"..	c #CACAB9",
+"+.	c #B0B0A1",
+"@.	c #ABAB9C",
+"#.	c #929284",
+"$.	c #53534B",
+"%.	c #8D8D82",
+"&.	c #BFBFAF",
+"*.	c #B5B5A5",
+"=.	c #B0B0A0",
+"-.	c #A6A697",
+";.	c #9C9C8D",
+">.	c #969689",
+",.	c #919184",
+"'.	c #65655C",
+").	c #6E6E65",
+"!.	c #B4B4A5",
+"~.	c #AFAFA0",
+"{.	c #AAAA9B",
+"].	c #A5A596",
+"^.	c #A0A092",
+"/.	c #969688",
+"(.	c #919183",
+"_.	c #241D14",
+":.	c #211100",
+"<.	c #262623",
+"[.	c #8C8C80",
+"}.	c #9D9D8E",
+"|.	c #7F7F74",
+"1.	c #55554E",
+"2.	c #E9D1B8",
+"3.	c #A6825C",
+"4.	c #582D00",
+"5.	c #0B0600",
+"6.	c #160B00",
+"7.	c #4D2800",
+"8.	c #371C00",
+"9.	c #372B1F",
+"              . . . . . .                       ",
+"          . . . . . . . . . .                   ",
+"        . . + @ # $ % & * = . .                 ",
+"      . . - ; > , ' ) ! ~ { ] . .               ",
+"    . . ^ / ( _ : < [ } | 1 $ 2 . .             ",
+"  . . 3 4 . . . . 5 6 . . . . 7 8 . .           ",
+"  . 9 0 a . b b b 5 c b b b . d e f .           ",
+". . @ g h . b i j k l m n b . o p q . .         ",
+". . r , s . . . . . . . . . . t u v . .         ",
+". . w x 6 y . . . . . . . . z u A B . .         ",
+". . C } D ! . . . . . . . . E F G H . .         ",
+". . I } J . . . . . . . . . . K L M . .         ",
+". . * N O . b b P Q R S T b . U V W . .         ",
+"  . 9 1 $ . b b b X Y b b b . Z 2 ` .           ",
+"  . .  .... . . . +.@.. . . . #.$.. .           ",
+"    . . %.&.& *.=.@.-.B ;.>.,.'.. . .           ",
+"      . . ).!.~.{.].^.H /.(.$.. . _.:..         ",
+"        . . <.'.[.}.Z |.1.` . . _.2.3.4.5.      ",
+"          . . . . . . . . . . . 6.3.2.3.4.5.    ",
+"              . . . . . .       . 7.3.2.3.4..   ",
+"                                  5.4.3.2.3.8.. ",
+"                                    5.4.3.2.3.. ",
+"                                      5.7.3.2.. ",
+"                                        . 6.9.. "};
+
diff --git a/pdf/xpdf/stock-zoom-fit.xpm b/pdf/xpdf/stock-zoom-fit.xpm
new file mode 100644
index 00000000..46a66747
--- /dev/null
+++ b/pdf/xpdf/stock-zoom-fit.xpm
@@ -0,0 +1,181 @@
+/* XPM */
+static char * stock_zoom_fit_xpm[] = {
+"24 24 154 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #30302D",
+"@ 	c #7E7E75",
+"# 	c #B3B3A5",
+"$ 	c #CFCFBE",
+"% 	c #D2D2C1",
+"& 	c #BABAAA",
+"* 	c #848479",
+"= 	c #31312D",
+"- 	c #87877F",
+"; 	c #D7D7CC",
+"> 	c #DADACD",
+", 	c #DADACC",
+"' 	c #DADACB",
+") 	c #DCDCCC",
+"! 	c #DFDFCF",
+"~ 	c #DEDECD",
+"{ 	c #D9D9C8",
+"] 	c #7E7E73",
+"^ 	c #A6A69D",
+"/ 	c #E2E2D9",
+"( 	c #E9E9E2",
+"_ 	c #EAEAE2",
+": 	c #E6E6DB",
+"< 	c #E3E3D5",
+"[ 	c #E3E3D3",
+"} 	c #DFDFCE",
+"| 	c #D9D9C7",
+"1 	c #D4D4C3",
+"2 	c #929285",
+"3 	c #86867E",
+"4 	c #E0E0D8",
+"5 	c #EAEADF",
+"6 	c #E2E2D4",
+"7 	c #C4C4B4",
+"8 	c #717168",
+"9 	c #30302C",
+"0 	c #D6D6CA",
+"a 	c #E7E7DF",
+"b 	c #DFDFD0",
+"c 	c #BFBFAE",
+"d 	c #B9B9AA",
+"e 	c #282824",
+"f 	c #D9D9CC",
+"g 	c #E6E6DD",
+"h 	c #F9F9F5",
+"i 	c #F0F0E9",
+"j 	c #E4E4D9",
+"k 	c #D9D9CA",
+"l 	c #D0D0C0",
+"m 	c #C8C8B9",
+"n 	c #B9B9A9",
+"o 	c #B4B4A4",
+"p 	c #68685F",
+"q 	c #B3B3A6",
+"r 	c #E4E4D8",
+"s 	c #EFEFE6",
+"t 	c #E7E7DC",
+"u 	c #DCDCCF",
+"v 	c #D2D2C3",
+"w 	c #CACABA",
+"x 	c #C3C3B3",
+"y 	c #B3B3A4",
+"z 	c #AEAE9F",
+"A 	c #909083",
+"B 	c #D1D1C0",
+"C 	c #DBDBCC",
+"D 	c #E8E8DB",
+"E 	c #E6E6DA",
+"F 	c #E2E2D5",
+"G 	c #CACABB",
+"H 	c #BDBDAD",
+"I 	c #B8B8A8",
+"J 	c #B3B3A3",
+"K 	c #A9A99A",
+"L 	c #A1A192",
+"M 	c #D5D5C3",
+"N 	c #E2E2D1",
+"O 	c #DBDBCB",
+"P 	c #D6D6C7",
+"Q 	c #D0D0C1",
+"R 	c #C3C3B2",
+"S 	c #BDBDAC",
+"T 	c #B7B7A8",
+"U 	c #B2B2A3",
+"V 	c #ADAD9E",
+"W 	c #A8A899",
+"X 	c #A3A395",
+"Y 	c #9B9B8D",
+"Z 	c #BDBDAE",
+"` 	c #DBDBCA",
+" .	c #CDCDBD",
+"..	c #C8C8B8",
+"+.	c #C1C1B2",
+"@.	c #BCBCAC",
+"#.	c #B7B7A7",
+"$.	c #B2B2A2",
+"%.	c #A3A394",
+"&.	c #9E9E8F",
+"*.	c #828275",
+"=.	c #DADAC8",
+"-.	c #D5D5C4",
+";.	c #C6C6B5",
+">.	c #C1C1B0",
+",.	c #BBBBAC",
+"'.	c #B6B6A7",
+").	c #B1B1A2",
+"!.	c #ACAC9D",
+"~.	c #9D9D8F",
+"{.	c #98988A",
+"].	c #57574F",
+"^.	c #B6B6A6",
+"/.	c #B1B1A1",
+"(.	c #989889",
+"_.	c #1F1F1C",
+":.	c #7B7B71",
+"<.	c #CACAB9",
+"[.	c #B0B0A1",
+"}.	c #ABAB9C",
+"|.	c #929284",
+"1.	c #53534B",
+"2.	c #8D8D82",
+"3.	c #BFBFAF",
+"4.	c #B5B5A5",
+"5.	c #B0B0A0",
+"6.	c #A6A697",
+"7.	c #9C9C8D",
+"8.	c #969689",
+"9.	c #919184",
+"0.	c #65655C",
+"a.	c #6E6E65",
+"b.	c #B4B4A5",
+"c.	c #AFAFA0",
+"d.	c #AAAA9B",
+"e.	c #A5A596",
+"f.	c #A0A092",
+"g.	c #969688",
+"h.	c #919183",
+"i.	c #241D14",
+"j.	c #211100",
+"k.	c #262623",
+"l.	c #8C8C80",
+"m.	c #9D9D8E",
+"n.	c #7F7F74",
+"o.	c #55554E",
+"p.	c #E9D1B8",
+"q.	c #A6825C",
+"r.	c #582D00",
+"s.	c #0B0600",
+"t.	c #160B00",
+"u.	c #4D2800",
+"v.	c #371C00",
+"w.	c #372B1F",
+"              . . . . . .                       ",
+"          . . . . . . . . . .                   ",
+"        . . + @ # $ % & * = . .                 ",
+"      . . - ; > , ' ) ! ~ { ] . .               ",
+"    . . ^ / ( _ : < [ } | 1 $ 2 . .             ",
+"  . . 3 4 . . . . 5 6 . . . . 7 8 . .           ",
+"  . 9 0 a . . . . 5 b . . . . c d e .           ",
+". . @ f g . . h i j k l m . . n o p . .         ",
+". . q , r . . s t u v w x . . y z A . .         ",
+". . B C 6 D E F > v G x H I J z K L . .         ",
+". . M } N ! O P Q w R S T U V W X Y . .         ",
+". . Z } ` . .  ...+.@.#.$.. . %.&.*.. .         ",
+". . * =.-.. . ;.>.,.'.).!.. . ~.{.].. .         ",
+"  . 9 1 $ . . . . ^./.. . . . (.2 _..           ",
+"  . . :.<.. . . . [.}.. . . . |.1.. .           ",
+"    . . 2.3.& 4.5.}.6.L 7.8.9.0.. . .           ",
+"      . . a.b.c.d.e.f.Y g.h.1.. . i.j..         ",
+"        . . k.0.l.m.(.n.o._.. . i.p.q.r.s.      ",
+"          . . . . . . . . . . . t.q.p.q.r.s.    ",
+"              . . . . . .       . u.q.p.q.r..   ",
+"                                  s.r.q.p.q.v.. ",
+"                                    s.r.q.p.q.. ",
+"                                      s.u.q.p.. ",
+"                                        . t.w.. "};
diff --git a/pdf/xpdf/stock-zoom-in.xpm b/pdf/xpdf/stock-zoom-in.xpm
new file mode 100644
index 00000000..a5bb0eb1
--- /dev/null
+++ b/pdf/xpdf/stock-zoom-in.xpm
@@ -0,0 +1,190 @@
+/* XPM */
+static char * stock_zoom_in_xpm[] = {
+"24 24 163 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #30302D",
+"@ 	c #7E7E75",
+"# 	c #B3B3A5",
+"$ 	c #CFCFBE",
+"% 	c #D2D2C1",
+"& 	c #BABAAA",
+"* 	c #848479",
+"= 	c #31312D",
+"- 	c #87877F",
+"; 	c #D7D7CC",
+"> 	c #DADACD",
+", 	c #DADACC",
+"' 	c #DADACB",
+") 	c #DCDCCC",
+"! 	c #DFDFCF",
+"~ 	c #DEDECD",
+"{ 	c #D9D9C8",
+"] 	c #7E7E73",
+"^ 	c #A6A69D",
+"/ 	c #E2E2D9",
+"( 	c #E9E9E2",
+"_ 	c #EAEAE2",
+": 	c #E6E6DB",
+"< 	c #E3E3D5",
+"[ 	c #E3E3D3",
+"} 	c #DFDFCE",
+"| 	c #D9D9C7",
+"1 	c #D4D4C3",
+"2 	c #929285",
+"3 	c #86867E",
+"4 	c #E0E0D8",
+"5 	c #F0F0EB",
+"6 	c #F8F8F5",
+"7 	c #F7F7F3",
+"8 	c #F0F0E9",
+"9 	c #DADACA",
+"0 	c #D3D3C2",
+"a 	c #CECEBD",
+"b 	c #C9C9B8",
+"c 	c #C4C4B4",
+"d 	c #717168",
+"e 	c #30302C",
+"f 	c #D6D6CA",
+"g 	c #E7E7DF",
+"h 	c #F6F6F3",
+"i 	c #FEFEFD",
+"j 	c #FCFCFA",
+"k 	c #F5F5EF",
+"l 	c #D6D6C6",
+"m 	c #C4C4B3",
+"n 	c #BFBFAE",
+"o 	c #B9B9AA",
+"p 	c #282824",
+"q 	c #D9D9CC",
+"r 	c #E6E6DD",
+"s 	c #F3F3EE",
+"t 	c #FAFAF7",
+"u 	c #F9F9F5",
+"v 	c #D0D0C0",
+"w 	c #C8C8B9",
+"x 	c #C3C3B3",
+"y 	c #BEBEAE",
+"z 	c #B9B9A9",
+"A 	c #B4B4A4",
+"B 	c #68685F",
+"C 	c #B3B3A6",
+"D 	c #E4E4D8",
+"E 	c #EDEDE4",
+"F 	c #F2F2EA",
+"G 	c #EFEFE6",
+"H 	c #E7E7DC",
+"I 	c #CACABA",
+"J 	c #BEBEAD",
+"K 	c #B8B8A9",
+"L 	c #B3B3A4",
+"M 	c #AEAE9F",
+"N 	c #909083",
+"O 	c #D1D1C0",
+"P 	c #DBDBCC",
+"Q 	c #E2E2D4",
+"R 	c #A9A99A",
+"S 	c #A1A192",
+"T 	c #D5D5C3",
+"U 	c #E2E2D1",
+"V 	c #A8A899",
+"W 	c #A3A395",
+"X 	c #9B9B8D",
+"Y 	c #BDBDAE",
+"Z 	c #DBDBCA",
+"` 	c #D2D2C2",
+" .	c #CDCDBD",
+"..	c #C8C8B8",
+"+.	c #B7B7A7",
+"@.	c #B2B2A2",
+"#.	c #ADAD9E",
+"$.	c #A3A394",
+"%.	c #9E9E8F",
+"&.	c #828275",
+"*.	c #DADAC8",
+"=.	c #D5D5C4",
+"-.	c #D0D0BF",
+";.	c #CBCBBA",
+">.	c #C6C6B5",
+",.	c #C1C1B0",
+"'.	c #B1B1A2",
+").	c #ACAC9D",
+"!.	c #A7A798",
+"~.	c #A2A294",
+"{.	c #9D9D8F",
+"].	c #98988A",
+"^.	c #57574F",
+"/.	c #CACAB9",
+"(.	c #C5C5B5",
+"_.	c #C0C0B0",
+":.	c #BBBBAB",
+"<.	c #A2A293",
+"[.	c #9D9D8E",
+"}.	c #989889",
+"|.	c #1F1F1C",
+"1.	c #7B7B71",
+"2.	c #C5C5B4",
+"3.	c #C0C0AF",
+"4.	c #BABAAB",
+"5.	c #B5B5A6",
+"6.	c #A6A697",
+"7.	c #A1A193",
+"8.	c #9C9C8E",
+"9.	c #979789",
+"0.	c #929284",
+"a.	c #53534B",
+"b.	c #8D8D82",
+"c.	c #BFBFAF",
+"d.	c #B5B5A5",
+"e.	c #B0B0A0",
+"f.	c #ABAB9C",
+"g.	c #9C9C8D",
+"h.	c #969689",
+"i.	c #919184",
+"j.	c #65655C",
+"k.	c #6E6E65",
+"l.	c #B4B4A5",
+"m.	c #AFAFA0",
+"n.	c #AAAA9B",
+"o.	c #A5A596",
+"p.	c #A0A092",
+"q.	c #969688",
+"r.	c #919183",
+"s.	c #241D14",
+"t.	c #211100",
+"u.	c #262623",
+"v.	c #8C8C80",
+"w.	c #7F7F74",
+"x.	c #55554E",
+"y.	c #E9D1B8",
+"z.	c #A6825C",
+"A.	c #582D00",
+"B.	c #0B0600",
+"C.	c #160B00",
+"D.	c #4D2800",
+"E.	c #371C00",
+"F.	c #372B1F",
+"              . . . . . .                       ",
+"          . . . . . . . . . .                   ",
+"        . . + @ # $ % & * = . .                 ",
+"      . . - ; > , ' ) ! ~ { ] . .               ",
+"    . . ^ / ( _ : < [ } | 1 $ 2 . .             ",
+"  . . 3 4 5 6 7 8 . . 9 0 a b c d . .           ",
+"  . e f g h i j k . . l $ b m n o p .           ",
+". . @ q r s t u 8 . . v w x y z A B . .         ",
+". . C , D E F G H . . I x J K L M N . .         ",
+". . O P Q . . . . . . . . . . M R S . .         ",
+". . T } U . . . . . . . . . . V W X . .         ",
+". . Y } Z l `  .... . +.@.#.V $.%.&.. .         ",
+". . * *.=.-.;.>.,.. . '.).!.~.{.].^.. .         ",
+"  . e 1 $ /.(._.:.. . ).!.<.[.}.2 |..           ",
+"  . . 1./.2.3.4.5.. . 6.7.8.9.0.a.. .           ",
+"    . . b.c.& d.e.f.6.S g.h.i.j.. . .           ",
+"      . . k.l.m.n.o.p.X q.r.a.. . s.t..         ",
+"        . . u.j.v.[.}.w.x.|.. . s.y.z.A.B.      ",
+"          . . . . . . . . . . . C.z.y.z.A.B.    ",
+"              . . . . . .       . D.z.y.z.A..   ",
+"                                  B.A.z.y.z.E.. ",
+"                                    B.A.z.y.z.. ",
+"                                      B.D.z.y.. ",
+"                                        . C.F.. "};
\ No newline at end of file
diff --git a/pdf/xpdf/stock-zoom-out.xpm b/pdf/xpdf/stock-zoom-out.xpm
new file mode 100644
index 00000000..8686fed2
--- /dev/null
+++ b/pdf/xpdf/stock-zoom-out.xpm
@@ -0,0 +1,203 @@
+/* XPM */
+static char * stock_zoom_out_xpm[] = {
+"24 24 176 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #30302D",
+"@ 	c #7E7E75",
+"# 	c #B3B3A5",
+"$ 	c #CFCFBE",
+"% 	c #D2D2C1",
+"& 	c #BABAAA",
+"* 	c #848479",
+"= 	c #31312D",
+"- 	c #87877F",
+"; 	c #D7D7CC",
+"> 	c #DADACD",
+", 	c #DADACC",
+"' 	c #DADACB",
+") 	c #DCDCCC",
+"! 	c #DFDFCF",
+"~ 	c #DEDECD",
+"{ 	c #D9D9C8",
+"] 	c #7E7E73",
+"^ 	c #A6A69D",
+"/ 	c #E2E2D9",
+"( 	c #E9E9E2",
+"_ 	c #EAEAE2",
+": 	c #E6E6DB",
+"< 	c #E3E3D5",
+"[ 	c #E3E3D3",
+"} 	c #DFDFCE",
+"| 	c #D9D9C7",
+"1 	c #D4D4C3",
+"2 	c #929285",
+"3 	c #86867E",
+"4 	c #E0E0D8",
+"5 	c #F0F0EB",
+"6 	c #F8F8F5",
+"7 	c #F7F7F3",
+"8 	c #F0F0E9",
+"9 	c #EAEADF",
+"0 	c #E2E2D4",
+"a 	c #DADACA",
+"b 	c #D3D3C2",
+"c 	c #CECEBD",
+"d 	c #C9C9B8",
+"e 	c #C4C4B4",
+"f 	c #717168",
+"g 	c #30302C",
+"h 	c #D6D6CA",
+"i 	c #E7E7DF",
+"j 	c #F6F6F3",
+"k 	c #FEFEFD",
+"l 	c #FCFCFA",
+"m 	c #F5F5EF",
+"n 	c #DFDFD0",
+"o 	c #D6D6C6",
+"p 	c #C4C4B3",
+"q 	c #BFBFAE",
+"r 	c #B9B9AA",
+"s 	c #282824",
+"t 	c #D9D9CC",
+"u 	c #E6E6DD",
+"v 	c #F3F3EE",
+"w 	c #FAFAF7",
+"x 	c #F9F9F5",
+"y 	c #E4E4D9",
+"z 	c #D9D9CA",
+"A 	c #D0D0C0",
+"B 	c #C8C8B9",
+"C 	c #C3C3B3",
+"D 	c #BEBEAE",
+"E 	c #B9B9A9",
+"F 	c #B4B4A4",
+"G 	c #68685F",
+"H 	c #B3B3A6",
+"I 	c #E4E4D8",
+"J 	c #EDEDE4",
+"K 	c #F2F2EA",
+"L 	c #EFEFE6",
+"M 	c #E7E7DC",
+"N 	c #DCDCCF",
+"O 	c #D2D2C3",
+"P 	c #CACABA",
+"Q 	c #BEBEAD",
+"R 	c #B8B8A9",
+"S 	c #B3B3A4",
+"T 	c #AEAE9F",
+"U 	c #909083",
+"V 	c #D1D1C0",
+"W 	c #DBDBCC",
+"X 	c #A9A99A",
+"Y 	c #A1A192",
+"Z 	c #D5D5C3",
+"` 	c #E2E2D1",
+" .	c #A8A899",
+"..	c #A3A395",
+"+.	c #9B9B8D",
+"@.	c #BDBDAE",
+"#.	c #DBDBCA",
+"$.	c #D2D2C2",
+"%.	c #CDCDBD",
+"&.	c #C8C8B8",
+"*.	c #C1C1B2",
+"=.	c #BCBCAC",
+"-.	c #B7B7A7",
+";.	c #B2B2A2",
+">.	c #ADAD9E",
+",.	c #A3A394",
+"'.	c #9E9E8F",
+").	c #828275",
+"!.	c #DADAC8",
+"~.	c #D5D5C4",
+"{.	c #D0D0BF",
+"].	c #CBCBBA",
+"^.	c #C6C6B5",
+"/.	c #C1C1B0",
+"(.	c #BBBBAC",
+"_.	c #B6B6A7",
+":.	c #B1B1A2",
+"<.	c #ACAC9D",
+"[.	c #A7A798",
+"}.	c #A2A294",
+"|.	c #9D9D8F",
+"1.	c #98988A",
+"2.	c #57574F",
+"3.	c #CACAB9",
+"4.	c #C5C5B5",
+"5.	c #C0C0B0",
+"6.	c #BBBBAB",
+"7.	c #B6B6A6",
+"8.	c #B1B1A1",
+"9.	c #A2A293",
+"0.	c #9D9D8E",
+"a.	c #989889",
+"b.	c #1F1F1C",
+"c.	c #7B7B71",
+"d.	c #C5C5B4",
+"e.	c #C0C0AF",
+"f.	c #BABAAB",
+"g.	c #B5B5A6",
+"h.	c #B0B0A1",
+"i.	c #ABAB9C",
+"j.	c #A6A697",
+"k.	c #A1A193",
+"l.	c #9C9C8E",
+"m.	c #979789",
+"n.	c #929284",
+"o.	c #53534B",
+"p.	c #8D8D82",
+"q.	c #BFBFAF",
+"r.	c #B5B5A5",
+"s.	c #B0B0A0",
+"t.	c #9C9C8D",
+"u.	c #969689",
+"v.	c #919184",
+"w.	c #65655C",
+"x.	c #6E6E65",
+"y.	c #B4B4A5",
+"z.	c #AFAFA0",
+"A.	c #AAAA9B",
+"B.	c #A5A596",
+"C.	c #A0A092",
+"D.	c #969688",
+"E.	c #919183",
+"F.	c #241D14",
+"G.	c #211100",
+"H.	c #262623",
+"I.	c #8C8C80",
+"J.	c #7F7F74",
+"K.	c #55554E",
+"L.	c #E9D1B8",
+"M.	c #A6825C",
+"N.	c #582D00",
+"O.	c #0B0600",
+"P.	c #160B00",
+"Q.	c #4D2800",
+"R.	c #371C00",
+"S.	c #372B1F",
+"              . . . . . .                       ",
+"          . . . . . . . . . .                   ",
+"        . . + @ # $ % & * = . .                 ",
+"      . . - ; > , ' ) ! ~ { ] . .               ",
+"    . . ^ / ( _ : < [ } | 1 $ 2 . .             ",
+"  . . 3 4 5 6 7 8 9 0 a b c d e f . .           ",
+"  . g h i j k l m 9 n o $ d p q r s .           ",
+". . @ t u v w x 8 y z A B C D E F G . .         ",
+". . H , I J K L M N O P C Q R S T U . .         ",
+". . V W 0 . . . . . . . . . . T X Y . .         ",
+". . Z } ` . . . . . . . . . .  ...+.. .         ",
+". . @.} #.o $.%.&.*.=.-.;.>. .,.'.).. .         ",
+". . * !.~.{.].^./.(._.:.<.[.}.|.1.2.. .         ",
+"  . g 1 $ 3.4.5.6.7.8.<.[.9.0.a.2 b..           ",
+"  . . c.3.d.e.f.g.h.i.j.k.l.m.n.o.. .           ",
+"    . . p.q.& r.s.i.j.Y t.u.v.w.. . .           ",
+"      . . x.y.z.A.B.C.+.D.E.o.. . F.G..         ",
+"        . . H.w.I.0.a.J.K.b.. . F.L.M.N.O.      ",
+"          . . . . . . . . . . . P.M.L.M.N.O.    ",
+"              . . . . . .       . Q.M.L.M.N..   ",
+"                                  O.N.M.L.M.R.. ",
+"                                    O.N.M.L.M.. ",
+"                                      O.Q.M.L.. ",
+"                                        . P.S.. "};
\ No newline at end of file
-- 
2.43.5