* Fixed icons location and Debian desktop menus.

Makefile.in

@@ -483,7 +483,7 @@ clean:
 	rm -f $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ) $(STD_PLUGIN_OBJ)
 	rm -f plugins/*/*.o plugins/*/*.moc plugins/*/*.bak
 	rm -f src/*/*.o extras/*/*.o
-	rm -f lib/*.so vlc gvlc kvlc qvlc
+	rm -f lib/*.so vlc gnome-vlc gvlc kvlc qvlc
 
 distclean: clean
 	rm -f **/*.o **/*~ *.log
@@ -559,9 +559,11 @@ snapshot:
 		changelog changelog-css rules rules-css vlc.dirs \
 		vlc.menu ; do \
 			cp debian/$$file /tmp/vlc-@VLC_VERSION@/debian/ ; done
-	for file in default8x16.psf default8x9.psf gvlc.png vlc.png \
-		gvlc.xpm vlc.xpm ; do \
+	for file in default8x16.psf default8x9.psf ; do \
 		cp share/$$file /tmp/vlc-@VLC_VERSION@/share/ ; done
+	for icon in vlc gvlc qvlc gnome-vlc ; do \
+		cp share/$$icon.xpm share/$$icon.png \
+			/tmp/vlc-@VLC_VERSION@/share/ ; done
 
 	# build css-enabled archives
 	(cd /tmp ; tar cf vlc-@VLC_VERSION@.tar vlc-@VLC_VERSION@ ; \
@@ -581,7 +583,7 @@ FORCE:
 # GTK/Gnome and Framebuffer aliases - don't add new aliases which could bloat
 # the namespace
 #
-gvlc kvlc qvlc: vlc
+gnome-vlc gvlc kvlc qvlc: vlc
 	rm -f $@ && ln -s vlc $@
 
 

configure

@@ -3267,8 +3267,6 @@ if test x$host_os = xbeos; then
 
 else
 
-GVLC=0
-
 # Check whether --enable-dsp or --disable-dsp was given.
 if test "${enable_dsp+set}" = set; then
   enableval="$enable_dsp"
@@ -3301,17 +3299,17 @@ else
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3305: checking for $ac_hdr" >&5
+echo "configure:3303: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3310 "configure"
+#line 3308 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3375,17 +3373,17 @@ if test "${with_sdl+set}" = set; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3379: checking for $ac_hdr" >&5
+echo "configure:3377: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3384 "configure"
+#line 3382 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3423,17 +3421,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3427: checking for $ac_hdr" >&5
+echo "configure:3425: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3432 "configure"
+#line 3430 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3435: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3497,7 +3495,7 @@ fi
 # Check whether --enable-gnome or --disable-gnome was given.
 if test "${enable_gnome+set}" = set; then
   enableval="$enable_gnome"
-  if test x$enable_gnome = xyes; then PLUGINS=${PLUGINS}"gnome "; GVLC=1; fi
+  if test x$enable_gnome = xyes; then PLUGINS=${PLUGINS}"gnome "; ALIASES=${ALIASES}"gnome-vlc "; fi
 fi
 
 # Check whether --enable-gtk or --disable-gtk was given.
@@ -3508,8 +3506,7 @@ fi
 
 if test x$enable_gtk != xno; then
   if which gtk-config; then
-    PLUGINS=${PLUGINS}"gtk "
-    GVLC=1
+    PLUGINS=${PLUGINS}"gtk "; ALIASES=${ALIASES}"gvlc "
   fi
 fi
 # Check whether --enable-x11 or --disable-x11 was given.
@@ -3523,17 +3520,17 @@ if test x$enable_x11 != xno; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3527: checking for $ac_hdr" >&5
+echo "configure:3524: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3532 "configure"
+#line 3529 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3537: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3572,17 +3569,17 @@ if test "${enable_alsa+set}" = set; then
   enableval="$enable_alsa"
   if test x$enable_alsa = xyes; then ac_safe=`echo "sys/asoundlib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/asoundlib.h""... $ac_c" 1>&6
-echo "configure:3576: checking for sys/asoundlib.h" >&5
+echo "configure:3573: checking for sys/asoundlib.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3581 "configure"
+#line 3578 "configure"
 #include "confdefs.h"
 #include <sys/asoundlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3599,7 +3596,7 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6
-echo "configure:3603: checking for main in -lasound" >&5
+echo "configure:3600: checking for main in -lasound" >&5
 ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3607,14 +3604,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lasound  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3611 "configure"
+#line 3608 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:3618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3643,8 +3640,6 @@ fi
 fi
 
 
-if test x$GVLC = x1 ; then ALIASES=${ALIASES}"gvlc "; fi
-
 fi
 
 

configure.in

@@ -158,8 +158,6 @@ if test x$host_os = xbeos; then
 dnl default case
 else
 
-GVLC=0
-
 AC_ARG_ENABLE(dsp,
   [  --disable-dsp           Linux /dev/dsp support (default enabled)])
 if test x$enable_dsp != xno; then
@@ -235,13 +233,12 @@ AC_ARG_ENABLE(kde,
   [if test x$enable_kde = xyes; then PLUGINS=${PLUGINS}"kde "; ALIASES=${ALIASES}"kvlc "; fi])
 AC_ARG_ENABLE(gnome,
   [  --enable-gnome          Gnome interface support (default disabled)],
-  [if test x$enable_gnome = xyes; then PLUGINS=${PLUGINS}"gnome "; GVLC=1; fi])
+  [if test x$enable_gnome = xyes; then PLUGINS=${PLUGINS}"gnome "; ALIASES=${ALIASES}"gnome-vlc "; fi])
 AC_ARG_ENABLE(gtk,
   [  --disable-gtk           Gtk+ support (default enabled)])
 if test x$enable_gtk != xno; then
   if which gtk-config; then
-    PLUGINS=${PLUGINS}"gtk "
-    GVLC=1
+    PLUGINS=${PLUGINS}"gtk "; ALIASES=${ALIASES}"gvlc "
   fi
 fi
 AC_ARG_ENABLE(x11,
@@ -257,8 +254,6 @@ AC_ARG_ENABLE(alsa,
   [  --enable-alsa           Alsa sound drivers support (Only for linux) (default disabled)],
   [if test x$enable_alsa = xyes; then AC_CHECK_HEADER(sys/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false") if test $have_alsa = true; then PLUGINS=${PLUGINS}"alsa "; fi; fi])
 
-if test x$GVLC = x1 ; then ALIASES=${ALIASES}"gvlc "; fi
-
 fi
 
 AC_SUBST(SYS)

debian/control

@@ -7,7 +7,7 @@ Standards-Version: 3.0.1
 
 Package: vlc
 Architecture: any
-Depends: ${shlibs:Depends}, vlc-gtk
+Depends: ${shlibs:Depends}, vlc-gui
 Suggests: vlc-sdl, vlc-esd, vlc-gnome
 Description: the free MPEG and DVD player VideoLAN Client
  VideoLAN is a free MPEG, MPEG2 and DVD software solution.
@@ -17,7 +17,8 @@ Description: the free MPEG and DVD player VideoLAN Client
 
 Package: vlc-gnome
 Architecture: any
-Depends: vlc (= ${Source-Version}), vlc-gtk (= ${Source-Version}), ${shlibs:Depends}
+Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
+Provides: vlc-gui
 Description: Gnome plugin for the VideoLAN Client
  VideoLAN is a free MPEG, MPEG2 and DVD software solution.
  .
@@ -28,6 +29,7 @@ Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
 Replaces: vlc-gnome (<= 0.2.63-2)
 Conflicts: vlc-gnome (<= 0.2.63-2)
+Provides: vlc-gui
 Description: Gtk+ plugin for the VideoLAN Client
  VideoLAN is a free MPEG, MPEG2 and DVD software solution.
  .
@@ -79,6 +81,7 @@ Description: Glide plugin for the VideoLAN Client
 Package: vlc-qt
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
+Provides: vlc-gui
 Description: Qt plugin for the VideoLAN Client
  VideoLAN is a free MPEG, MPEG2 and DVD software solution.
  .

debian/control-css

@@ -2,7 +2,7 @@ Source: vlc-css
 Section: non-US/main
 Priority: optional
 Maintainer: Samuel Hocevar <sam@zoy.org>
-Build-Depends: debhelper (>=2.2.0), xlib6g-dev
+Build-Depends: debhelper (>=2.2.0)
 Standards-Version: 3.0.1
 
 Package: vlc-css

debian/gnome-vlc.desktop

+[Desktop Entry]
+Name=GNOME VideoLAN Client
+Name[fr]=Client VideoLAN pour GNOME
+Comment=GNOME DVD and MPEG player
+Comment[fr]=Lecteur de DVD et MPEG pour GNOME
+Exec=gnome-vlc
+Icon=gnome-vlc.png
+Terminal=0
+Type=Application

debian/gvlc.desktop

+[Desktop Entry]
+Name=Gtk+ VideoLAN Client
+Name[fr]=Client VideoLAN pour Gtk+
+Comment=Gtk+ DVD and MPEG player
+Comment[fr]=Lecteur de DVD et MPEG pour Gtk+
+Exec=gvlc
+Icon=gvlc.png
+Terminal=0
+Type=Application

debian/rules

@@ -61,16 +61,48 @@ install: build
 
 	mkdir -p debian/vlc-gtk/usr/bin/
 	mv debian/vlc/usr/bin/gvlc debian/vlc-gtk/usr/bin/
+	mkdir -p debian/vlc-gnome/usr/bin/
+	mv debian/vlc/usr/bin/gnome-vlc debian/vlc-gnome/usr/bin/
 	mkdir -p debian/vlc-qt/usr/bin/
 	mv debian/vlc/usr/bin/qvlc debian/vlc-qt/usr/bin/
 
-	mkdir -p debian/vlc-gtk/usr/share/videolan/
-	mv debian/vlc/usr/share/videolan/gvlc.png \
-		debian/vlc/usr/share/videolan/gvlc.xpm \
-			debian/vlc-gtk/usr/share/videolan/
+	mkdir -p debian/vlc/usr/share/pixmaps/
+	mv debian/vlc/usr/share/videolan/vlc.png \
+		debian/vlc/usr/share/pixmaps/
+	mkdir -p debian/vlc/usr/share/gnome/apps/Multimedia/
+	cp debian/vlc.desktop debian/vlc/usr/share/gnome/apps/Multimedia/
 
+	mkdir -p debian/vlc-gtk/usr/share/videolan/ \
+		debian/vlc-gtk/usr/share/pixmaps/
+	mv debian/vlc/usr/share/videolan/gvlc.xpm \
+		debian/vlc-gtk/usr/share/videolan/
+	mv debian/vlc/usr/share/videolan/gvlc.png \
+		debian/vlc-gtk/usr/share/pixmaps/
+	mkdir -p debian/vlc-gtk/usr/share/gnome/apps/Multimedia/
+	cp debian/gvlc.desktop debian/vlc-gtk/usr/share/gnome/apps/Multimedia/
+
+	mkdir -p debian/vlc-gnome/usr/share/videolan/ \
+		debian/vlc-gnome/usr/share/pixmaps/
+	mv debian/vlc/usr/share/videolan/gnome-vlc.xpm \
+		debian/vlc-gnome/usr/share/videolan/
+	mv debian/vlc/usr/share/videolan/gnome-vlc.png \
+		debian/vlc-gnome/usr/share/pixmaps/
+	mkdir -p debian/vlc-gnome/usr/share/gnome/apps/Multimedia/
+	cp debian/gnome-vlc.desktop debian/vlc-gnome/usr/share/gnome/apps/Multimedia/
+
+	mkdir -p debian/vlc-qt/usr/share/videolan/ \
+		debian/vlc-qt/usr/share/pixmaps/
+	mv debian/vlc/usr/share/videolan/qvlc.xpm \
+		debian/vlc-qt/usr/share/videolan/
+	mv debian/vlc/usr/share/videolan/qvlc.png \
+		debian/vlc-qt/usr/share/pixmaps/
+
+	mkdir -p debian/vlc/usr/share/man/man1/
+	gzip < doc/vlc.1 >| debian/vlc/usr/share/man/man1/vlc.1.gz
 	mkdir -p debian/vlc-gtk/usr/share/man/man1/
 	ln -s vlc.1.gz debian/vlc-gtk/usr/share/man/man1/gvlc.1.gz
+	mkdir -p debian/vlc-gnome/usr/share/man/man1/
+	ln -s vlc.1.gz debian/vlc-gnome/usr/share/man/man1/gnome-vlc.1.gz
 	mkdir -p debian/vlc-qt/usr/share/man/man1/
 	ln -s vlc.1.gz debian/vlc-qt/usr/share/man/man1/qvlc.1.gz
 
@@ -90,9 +122,9 @@ binary-arch: build install
 #	dh_installemacsen
 #	dh_installpam
 #	dh_installinit
-	dh_installcron
-	dh_installmanpages -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl -Nvlc-alsa -Nvlc-qt doc/vlc.1
-	dh_installinfo
+	#dh_installcron
+#	dh_installmanpages -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl -Nvlc-alsa -Nvlc-qt doc/vlc.1
+	#dh_installinfo
 #	dh_undocumented
 	dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl -Nvlc-alsa -Nvlc-qt
 	dh_link

debian/vlc-gnome.menu

+?package(vlc-gnome):command="/usr/bin/gnome-vlc" hotkey="V" needs="X11" \
+                    section="Apps/Viewers" title="Gnome VideoLAN Client" \
+                    icon="/usr/share/videolan/gnome-vlc.xpm"

debian/vlc-gtk.menu

 ?package(vlc-gtk):command="/usr/bin/gvlc" hotkey="V" needs="X11" \
-                  section="Apps/Viewers" title="Gnome/Gtk VideoLAN Client" \
+                  section="Apps/Viewers" title="Gtk+ VideoLAN Client" \
                   icon="/usr/share/videolan/gvlc.xpm"

debian/vlc-qt.menu

+?package(vlc-qt):command="/usr/bin/qvlc" hotkey="V" needs="X11" \
+                 section="Apps/Viewers" title="Qt VideoLAN Client" \
+                 icon="/usr/share/videolan/qvlc.xpm"

debian/vlc.desktop

+[Desktop Entry]
+Name=VideoLAN Client
+Name[fr]=Client VideoLAN
+Comment=DVD and MPEG player
+Comment[fr]=Lecteur de DVD et MPEG
+Exec=vlc
+Icon=vlc.png
+Terminal=0
+Type=Application

doc/vlc.1

@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-vlc, gvlc, kvlc, qvlc \- The VideoLAN Client
+vlc, gvlc, gnome-vlc, kvlc, qvlc \- The VideoLAN Client
 .SH SYNOPSIS
 .B vlc
 .RI [ OPTIONS ]

plugins/gnome/intf_gnome.c

@@ -2,7 +2,7 @@
  * intf_gnome.c: Gnome interface
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: intf_gnome.c,v 1.26 2001/04/08 07:24:47 stef Exp $
+ * $Id: intf_gnome.c,v 1.27 2001/04/11 12:52:09 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stphane Borel <stef@via.ecp.fr>
@@ -128,6 +128,11 @@ static int intf_Probe( probedata_t *p_data )
         return( 999 );
     }
 
+    if( TestProgram( "gnome-vlc" ) )
+    {
+        return( 200 );
+    }
+
     return( 100 );
 }
 

plugins/gtk/intf_gtk.c

@@ -2,7 +2,7 @@
  * intf_gtk.c: Gtk+ interface
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: intf_gtk.c,v 1.11 2001/04/08 07:24:47 stef Exp $
+ * $Id: intf_gtk.c,v 1.12 2001/04/11 12:52:10 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stphane Borel <stef@via.ecp.fr>
@@ -125,6 +125,11 @@ static int intf_Probe( probedata_t *p_data )
         return( 999 );
     }
 
+    if( TestProgram( "gvlc" ) )
+    {
+        return( 190 );
+    }
+
     return( 90 );
 }
 

share/gnome-vlc.xpm

+/* XPM */
+static char * gnome_vlc_xpm[] = {
+"48 48 427 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #B96500",
+"@ 	c #D47E18",
+"# 	c #CD7F24",
+"$ 	c #9D611C",
+"% 	c #B86500",
+"& 	c #BF7722",
+"* 	c #9C682D",
+"= 	c #A47A4F",
+"- 	c #CE8838",
+"; 	c #DC974A",
+"> 	c #D69955",
+", 	c #DCA366",
+"' 	c #F1B474",
+") 	c #C08F5C",
+"! 	c #D58B36",
+"~ 	c #FFAE51",
+"{ 	c #FFB562",
+"] 	c #FFBC72",
+"^ 	c #FFBF7B",
+"/ 	c #D59F66",
+"( 	c #DC8E33",
+"_ 	c #FFAC4D",
+": 	c #FFB35D",
+"< 	c #FFBA6D",
+"[ 	c #DCA46A",
+"} 	c #C0751D",
+"| 	c #F89E36",
+"1 	c #FFAA48",
+"2 	c #FFB158",
+"3 	c #FFB869",
+"4 	c #FFBF79",
+"5 	c #F8B977",
+"6 	c #030303",
+"7 	c #D38A35",
+"8 	c #FDAC4D",
+"9 	c #FFAF54",
+"0 	c #FFB664",
+"a 	c #FFBD74",
+"b 	c #FDBF7D",
+"c 	c #D3A371",
+"d 	c #020202",
+"e 	c #111111",
+"f 	c #D3B898",
+"g 	c #FDE2C2",
+"h 	c #FDBD73",
+"i 	c #FDB96B",
+"j 	c #FDBF78",
+"k 	c #FDC587",
+"l 	c #FDCF9E",
+"m 	c #DAC4AE",
+"n 	c #272727",
+"o 	c #2A2A2A",
+"p 	c #DACDBC",
+"q 	c #FDF9F5",
+"r 	c #FDF0E1",
+"s 	c #FDEFDE",
+"t 	c #FDF1E4",
+"u 	c #FDF4EA",
+"v 	c #F6F2ED",
+"w 	c #BEB0A2",
+"x 	c #171717",
+"y 	c #BEA689",
+"z 	c #F6F2EE",
+"A 	c #FEFEFE",
+"B 	c #FDFCFC",
+"C 	c #D3CAC0",
+"D 	c #131313",
+"E 	c #D3C2AE",
+"F 	c #FDFCFB",
+"G 	c #DAD2C9",
+"H 	c #2B2B2B",
+"I 	c #D3B591",
+"J 	c #FDEDD9",
+"K 	c #FDFBF8",
+"L 	c #F6EBDF",
+"M 	c #BEAA95",
+"N 	c #050505",
+"O 	c #DA851D",
+"P 	c #FDAC4A",
+"Q 	c #FDDFBC",
+"R 	c #FDECD8",
+"S 	c #FDEDDB",
+"T 	c #FDF1E3",
+"U 	c #FDEBD7",
+"V 	c #D5A675",
+"W 	c #C06900",
+"X 	c #F88800",
+"Y 	c #FF8F08",
+"Z 	c #FDA031",
+"` 	c #FDA946",
+" .	c #FDAF54",
+"..	c #FDB561",
+"+.	c #FDBB6F",
+"@.	c #FDC07C",
+"#.	c #FDC485",
+"$.	c #FFC07E",
+"%.	c #D57400",
+"&.	c #FF8C00",
+"*.	c #FF910E",
+"=.	c #FF981E",
+"-.	c #FF9F2E",
+";.	c #FFA63F",
+">.	c #FFAD4F",
+",.	c #FFB45F",
+"'.	c #FFBB70",
+").	c #FF8F09",
+"!.	c #FF9619",
+"~.	c #FF9D2A",
+"{.	c #FFA43A",
+"].	c #FFAB4A",
+"^.	c #FFB25B",
+"/.	c #FFB96B",
+"(.	c #BEB7B1",
+"_.	c #DC7800",
+":.	c #FF8D04",
+"<.	c #FF9415",
+"[.	c #FF9B25",
+"}.	c #FFA235",
+"|.	c #FFA946",
+"1.	c #FFB056",
+"2.	c #FFB766",
+"3.	c #FFBE77",
+"4.	c #F1F1F0",
+"5.	c #BBB4AE",
+"6.	c #433A34",
+"7.	c #BE7318",
+"8.	c #F69520",
+"9.	c #FF8F07",
+"0.	c #FF9210",
+"a.	c #FF9920",
+"b.	c #FFA031",
+"c.	c #FFA741",
+"d.	c #F6B979",
+"e.	c #BE9366",
+"f.	c #50504F",
+"g.	c #E3DFDC",
+"h.	c #84786E",
+"i.	c #BAB7B5",
+"j.	c #E2DEDB",
+"k.	c #A59C94",
+"l.	c #39332D",
+"m.	c #FDDDB5",
+"n.	c #FDAA45",
+"o.	c #FD9E29",
+"p.	c #FD9A21",
+"q.	c #FF9311",
+"r.	c #FF971C",
+"s.	c #FF9E2C",
+"t.	c #FFA53C",
+"u.	c #FFBB71",
+"v.	c #FDC68C",
+"w.	c #D9C3AD",
+"x.	c #8B8784",
+"y.	c #C7C1BA",
+"z.	c #796E65",
+"A.	c #433B35",
+"B.	c #9F9995",
+"C.	c #B7ADA6",
+"D.	c #8D7E73",
+"E.	c #342D28",
+"F.	c #FDF9F4",
+"G.	c #FDE9D1",
+"H.	c #FDA53D",
+"I.	c #FDAB4A",
+"J.	c #FDB158",
+"K.	c #FDB765",
+"L.	c #FDCA91",
+"M.	c #F5F1EC",
+"N.	c #9D9287",
+"O.	c #7A6E65",
+"P.	c #332D29",
+"Q.	c #070605",
+"R.	c #5E534A",
+"S.	c #463D37",
+"T.	c #0B0A08",
+"U.	c #141414",
+"V.	c #D3C2AF",
+"W.	c #FDEBD5",
+"X.	c #FDEDDA",
+"Y.	c #FDEEDD",
+"Z.	c #FDEFE0",
+"`.	c #FDF2E7",
+" +	c #FDFAF8",
+".+	c #F2F1F1",
+"++	c #E0DEDC",
+"@+	c #B6AEA5",
+"#+	c #26221F",
+"$+	c #010101",
+"%+	c #26221E",
+"&+	c #1A1715",
+"*+	c #040303",
+"=+	c #DACCBB",
+"-+	c #E4E4E4",
+";+	c #B8B1AC",
+">+	c #5F5751",
+",+	c #252525",
+"'+	c #BE9C73",
+")+	c #F6EEE6",
+"!+	c #B5ACA5",
+"~+	c #736961",
+"{+	c #090908",