Add .../share/doc/feh/examples, move fehrc (feh themes) there

3 files changed, 22 insertions, 19 deletions

diff --git a/Makefile b/Makefile
index 06a9151..5c9b3c1 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ test-x11: all
 	prove test/feh-bg.i
 
 install: install-man install-doc install-bin install-font install-img
+install: install-examples
 
 install-man:
 	@echo installing manuals to ${man_dir}
@@ -49,6 +50,12 @@ install-img:
 	@cp data/images/* ${image_dir}
 	@chmod 644 ${image_dir}/*
 
+install-examples:
+	@echo installing examples to ${example_dir}
+	@mkdir -p ${example_dir}
+	@cp data/examples/* ${example_dir}
+	@chmod 644 ${example_dir}/*
+
 
 uninstall:
 	rm -f ${man_dir}/man1/feh.1 ${man_dir}/man1/feh-cam.1
@@ -79,4 +86,4 @@ clean:
 	@${MAKE} -C man clean
 
 .PHONY: all test test-x11 install uninstall clean install-man install-doc \
-	install-bin install-font install-img dist
+	install-bin install-font install-img install-examples dist
diff --git a/config.mk b/config.mk
index d2c96c4..fafaeb6 100644
--- a/config.mk
+++ b/config.mk
@@ -11,6 +11,7 @@ bin_dir = ${main_dir}/bin
 doc_dir = ${main_dir}/share/doc/feh
 image_dir = ${main_dir}/share/feh/images
 font_dir = ${main_dir}/share/feh/fonts
+example_dir = ${main_dir}/share/doc/feh/examples
 
 # default CFLAGS
 CFLAGS ?= -g -O2
diff --git a/src/fehrc.raw b/data/examples/themes
index 154a6e1..a507951 100644
--- a/src/fehrc.raw
+++ b/data/examples/themes
@@ -1,8 +1,6 @@
-# Feh configuration file.
-# Lines starting with # are comments. Don't use comments mid-line.
-
-# Feh expects to find this as ~/.fehrc or /etc/fehrc
-# If both are available, ~/.fehrc will be used
+# Feh themes configuration file.
+# Lines starting with # are comments. Midline comments are not supported.
+# Place this as either ~/.config/feh/themes or /etc/feh/themes
 
 # Options are defined in theme_name/options pairs.
 # Separate themename and options by whitespace.
@@ -14,8 +12,8 @@
 # mkindex theme.
 
 # Multiple options can of course be used. If they are too long for one line,
-# you can (usually) use a \\ to make them continue on the next one:
-# imagemap -rV --quiet -W 400 -H 300 \\
+# you can use a \ to make them continue on the next one, but not mid-option.
+# imagemap -rV --quiet -W 400 -H 300 \
 #          --thumb-width 40 --thumb-height 30
 
 # ====================
@@ -31,7 +29,7 @@ webcam --multiwindow --reload 20
 mkindex -iVO index.jpg .
 
 # More ambitious version...
-imgidx --index --output-only .fehindex.jpg --limit-width 1024 \\
+imgidx --index --output-only .fehindex.jpg --limit-width 1024 \
        --thumb-width 128 --thumb-height 128 --verbose --quiet
 
 # Show a presentation
@@ -43,15 +41,12 @@ booth --full-screen --hide-pointer --slideshow-delay 20
 # Screw xscreensaver, use feh =)
 screensave --recursive --full-screen --randomize --slideshow-delay 10 --hide-pointer
 
-# Add <img> tags to your html with ease :-)
-newimg -q -L \"<img src=\\\"%f\\\" alt=\\\"%n\\\" border=\\\"0\\\" width=\\\"%w\\\" height=\\\"%h\\\">\"
-
 # Different menus
 brushed --menu-bg " PREFIX "/share/feh/images/menubg_brushed.png
 aluminium --menu-bg " PREFIX "/share/feh/images/menubg_aluminium.png
 aqua --menu-bg " PREFIX "/share/feh/images/menubg_aqua.png
 sky --menu-bg " PREFIX "/share/feh/images/menubg_sky.png
-black --menu-bg " PREFIX "/share/feh/images/menubg_black.png \\
+black --menu-bg " PREFIX "/share/feh/images/menubg_black.png \
       --menu-style " PREFIX "/share/feh/fonts/black.style
 
 # Some more examples, used by the feh developer
@@ -59,16 +54,16 @@ black --menu-bg " PREFIX "/share/feh/images/menubg_black.png \\
 rfs --full-screen --hide-pointer --auto-zoom --randomize
 fs  --full-screen --hide-pointer --auto-zoom --sort filename
 
-thumb_s  --thumbnails --cache-thumbnails --thumb-width 128 --thumb-height 128 \\
-         --limit-width 1024 --sort filename \\
+thumb_s  --thumbnails --cache-thumbnails --thumb-width 128 --thumb-height 128 \
+         --limit-width 1024 --sort filename \
          --fontpath /usr/share/fonts/truetype/ttf-dejavu/ --font DejaVuSans/8
 
-thumb_b  --thumbnails --cache-thumbnails --thumb-width 256 --thumb-height 256 \\
-         --limit-width 1024 --sort filename \\
+thumb_b  --thumbnails --cache-thumbnails --thumb-width 256 --thumb-height 256 \
+         --limit-width 1024 --sort filename \
          --fontpath /usr/share/fonts/truetype/ttf-dejavu/ --font DejaVuSans/8
 
-thumb_s_nt --thumbnails --cache-thumbnails --thumb-width 128 --thumb-height 128 \\
+thumb_s_nt --thumbnails --cache-thumbnails --thumb-width 128 --thumb-height 128 \
            --limit-width 1024 --sort filename --index-name 0
 
-thumb_b_nt --thumbnails --cache-thumbnails --thumb-width 256 --thumb-height 256 \\
+thumb_b_nt --thumbnails --cache-thumbnails --thumb-width 256 --thumb-height 256 \
            --limit-width 1024 --sort filename --index-name 0