Because the tool's help page changes whether Xinerama support was compiled
or not, its man page have to reflect this, so instead of being simply
copied the file is processed with the 'replace-ac-keywords' script.
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
---
doc/Makefile.am | 15 +++++---
doc/wmsetbg.1x | 110 --------------------------------------------------------
doc/wmsetbg.in | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 120 insertions(+), 115 deletions(-)
delete mode 100644 doc/wmsetbg.1x
create mode 100644 doc/wmsetbg.in
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 904e3d8..fff203f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -17,17 +17,17 @@ dist_man_MANS = \
wmagnify.1x \
wmgenmenu.1 \
wmmenugen.1 \
- wmsetbg.1x \
WPrefs.1x \
wxcopy.1x \
wxpaste.1x
man_MANS = \
- wmaker.1x
+ wmaker.1x \
+ wmsetbg.1x
-MOSTLYCLEANFILES = wmaker.1x
+MOSTLYCLEANFILES = wmaker.1x wmsetbg.1x
-EXTRA_DIST = wmaker.in
+EXTRA_DIST = wmaker.in wmsetbg.in
wmaker.1x: wmaker.in Makefile $(top_builddir)/config.h
$(AM_V_GEN)$(top_srcdir)/script/replace-ac-keywords.sh \
@@ -36,6 +36,11 @@ wmaker.1x: wmaker.in Makefile $(top_builddir)/config.h
-D"pkgdatadir=$(pkgdatadir)" --replace "pkgdatadir" \
-o "wmaker.1x" "$(srcdir)/wmaker.in"
+wmsetbg.1x: wmsetbg.in Makefile $(top_builddir)/config.h
+ $(AM_V_GEN)$(top_srcdir)/script/replace-ac-keywords.sh \
+ --header "$(top_builddir)/config.h" --filter "USE_XINERAMA" \
+ -o "wmsetbg.1x" "$(srcdir)/wmsetbg.in"
+
# Create a 'silent rule' for our make check the same way automake does
AM_V_CHKOPTS = $(am__v_CHKOPTS_$(V))
am__v_CHKOPTS_ = $(am__v_CHKOPTS_$(AM_DEFAULT_VERBOSITY))
@@ -87,7 +92,7 @@ wmgenmenu-args:
wmsetbg-args:
$(AM_V_CHKOPTS)$(top_srcdir)/script/check-cmdline-options-doc.sh \
- --program "$(top_builddir)/util/wmsetbg" --man-page
"$(top_srcdir)/doc/wmsetbg.1x"
+ --program "$(top_builddir)/util/wmsetbg" --man-page "wmsetbg.1x"
wxcopy-args:
$(AM_V_CHKOPTS)$(top_srcdir)/script/check-cmdline-options-doc.sh \
diff --git a/doc/wmsetbg.1x b/doc/wmsetbg.1x
deleted file mode 100644
index 2125ad0..0000000
--- a/doc/wmsetbg.1x
+++ /dev/null
@@ -1,110 +0,0 @@
-.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH wmsetbg 1x "April 2015"
-.SH NAME
-wmsetbg \- sets the background on the X11 display
-.SH SYNOPSIS
-.B wmsetbg
-.RI [ \-display " display]"
-.RI [ \-\-update-domain " domain|" \-\-update-wmaker ]
-.RI [ options ]
-.RI [ image ]
-.SH DESCRIPTION
-.B wmsetbg
-reads the specified
-.I image
-(in any format supported by the
-.I WRaster
-library) and puts it on the root window. It can
-either scale the image or tile it to make it fit the root
-window. Window Maker uses this command internally to set the root
-window image on start up.
-.SH OPTIONS
-.TP
-.BR \-\-back\-color | \-b " \fIcolor\fP"
-the specified \fIcolor\fP is used as the background color for the
-\fItexture\fP. Window Maker temporary sets the background to this
-color while loading and processing the texture. You can specify colors
-using their X11 names or as an RGB triplet (either as "rgb:RR/GG/BB" or
-"#RRGGBB") (reference to appropriate manpage should be here). In the
-later case \fIcolor\fB is a quoted string.
-.TP
-.BR \-\-center | \-e
-centers the \fIimage\fP in the screen
-.TP
-.BR \-\-colors | \-c " \fIcount\fP"
-limit the number of colors per channel to use for the image
-.TP
-.BR \-display " \fIdisplay\fP"
-connect to the X \fIdisplay\fP
-.TP
-.BR \-\-dither | \-d
-enable color dithering on \fIimage\fP
-.TP
-.BR \-\-fillscale | \-f
-scales the specified \fIimage\fP to fill screen while preserving aspect ratio
-.TP
-.BR \-\-help | \-h
-print a help message with the list of options
-.TP
-.BR \-\-match | \-m
-use the best-matching-color algorithm when converting image to indexed color
palette
-.TP
-.BR \-\-maxscale | \-a
-scales the specified \fIimage\fP to fit inside the screen preserving its
aspect ratio
-.TP
-.BR \-\-parse | \-p " \fItexture\fP"
-parses the specified \fItexture\fP as a \fIproplist style texture\fP
-.TP
-.BR \-\-scale | \-s
-scales the specified \fIimage\fP to fill the screen (default)
-.TP
-.BR \-\-smooth | \-S
-use a smooth scaling algorithm when resizing \fIimage\fP
-.TP
-.BR \-\-tile | \-t
-tiles the specified \fIimage\fP
-.TP
-.BR \-\-update\-domain | \-D " \fIdomain\fP"
-updates the specified \fIdomain\fP database
-.TP
-.BR \-\-update\-wmaker | \-u
-updates the Window Maker defaults database
-.TP
-.BR \-\-version | \-v
-print the version of Window Maker from which the program comes
-.TP
-.BR \-\-workspace | \-w " \fIworkspace\fP"
-update background only for the specified \fIworkspace\fP
-.TP
-.BR \-\-xinerama | \-X
-stretch image across Xinerama heads
-.SH "INDEXED COLOR SCREENS"
-If your screen is not in a \fBTrue Color\fP configuration (generally sold as
16,777,216 colors) but
-in a indexed color mode (256 colors, 16 colors, ... which are based on a
\fBColorMap\fP) then Window
-Maker may need to process the image to convert it to a limited number of
colors before using it for
-a background image.
-
-There are two options to choose what algorithm you want to use:
-.TP
-.BR \-\-match " or " \-m
-Search for the closest matching color from the current colormap;
-this is the fastest algorithm but may lead to less good-looking result.
-.TP
-.BR \-\-dither " or " \-d
-Use a more complex algorithm which modify surrounding pixels to get a
closer-looking color on average;
-this is slower but provides better looking images.
-.LP
-If none is specified, then it is Window Maker's configuration choice that will
be used.
-
-You can also use the option \fB\-\-colors\fP to reduce the total number of
colors from the \fIimage\fP
-before the algorithm is applied.
-The value specified with the option defines the number of possible values for
each primary color
-(red, green and blue), for example \fI8\fP would reduce the image to use only
8*8*8=512 colors before
-applying the conversion algorithm.
-.SH SEE ALSO
-.BR wmaker (1x)
-.SH AUTHOR
-This man page was written by Marcelo Magallon <mmaga...@debian.org>.
-.PP
-Window Maker was written by Alfredo K. Kojima <koj...@windowmaker.info>.
-wmsetbg was written by Dan Pascu <d...@windowmaker.info>
diff --git a/doc/wmsetbg.in b/doc/wmsetbg.in
new file mode 100644
index 0000000..0139fec
--- /dev/null
+++ b/doc/wmsetbg.in
@@ -0,0 +1,110 @@
+.\" Hey, Emacs! This is an -*- nroff -*- source file.
+.TH wmsetbg 1x "April 2015"
+.SH NAME
+wmsetbg \- sets the background on the X11 display
+.SH SYNOPSIS
+.B wmsetbg
+.RI [ \-display " display]"
+.RI [ \-\-update-domain " domain|" \-\-update-wmaker ]
+.RI [ options ]
+.RI [ image ]
+.SH DESCRIPTION
+.B wmsetbg
+reads the specified
+.I image
+(in any format supported by the
+.I WRaster
+library) and puts it on the root window. It can
+either scale the image or tile it to make it fit the root
+window. Window Maker uses this command internally to set the root
+window image on start up.
+.SH OPTIONS
+.TP
+.BR \-\-back\-color | \-b " \fIcolor\fP"
+the specified \fIcolor\fP is used as the background color for the
+\fItexture\fP. Window Maker temporary sets the background to this
+color while loading and processing the texture. You can specify colors
+using their X11 names or as an RGB triplet (either as "rgb:RR/GG/BB" or
+"#RRGGBB") (reference to appropriate manpage should be here). In the
+later case \fIcolor\fB is a quoted string.
+.TP
+.BR \-\-center | \-e
+centers the \fIimage\fP in the screen
+.TP
+.BR \-\-colors | \-c " \fIcount\fP"
+limit the number of colors per channel to use for the image
+.TP
+.BR \-display " \fIdisplay\fP"
+connect to the X \fIdisplay\fP
+.TP
+.BR \-\-dither | \-d
+enable color dithering on \fIimage\fP
+.TP
+.BR \-\-fillscale | \-f
+scales the specified \fIimage\fP to fill screen while preserving aspect ratio
+.TP
+.BR \-\-help | \-h
+print a help message with the list of options
+.TP
+.BR \-\-match | \-m
+use the best-matching-color algorithm when converting image to indexed color
palette
+.TP
+.BR \-\-maxscale | \-a
+scales the specified \fIimage\fP to fit inside the screen preserving its
aspect ratio
+.TP
+.BR \-\-parse | \-p " \fItexture\fP"
+parses the specified \fItexture\fP as a \fIproplist style texture\fP
+.TP
+.BR \-\-scale | \-s
+scales the specified \fIimage\fP to fill the screen (default)
+.TP
+.BR \-\-smooth | \-S
+use a smooth scaling algorithm when resizing \fIimage\fP
+.TP
+.BR \-\-tile | \-t
+tiles the specified \fIimage\fP
+.TP
+.BR \-\-update\-domain | \-D " \fIdomain\fP"
+updates the specified \fIdomain\fP database
+.TP
+.BR \-\-update\-wmaker | \-u
+updates the Window Maker defaults database
+.TP
+.BR \-\-version | \-v
+print the version of Window Maker from which the program comes
+.TP
+.BR \-\-workspace | \-w " \fIworkspace\fP"
+update background only for the specified \fIworkspace\fP
+@USE_XINERAMA@.TP
+@USE_XINERAMA@.BR \-\-xinerama | \-X
+@USE_XINERAMA@stretch image across Xinerama heads
+.SH "INDEXED COLOR SCREENS"
+If your screen is not in a \fBTrue Color\fP configuration (generally sold as
16,777,216 colors) but
+in a indexed color mode (256 colors, 16 colors, ... which are based on a
\fBColorMap\fP) then Window
+Maker may need to process the image to convert it to a limited number of
colors before using it for
+a background image.
+
+There are two options to choose what algorithm you want to use:
+.TP
+.BR \-\-match " or " \-m
+Search for the closest matching color from the current colormap;
+this is the fastest algorithm but may lead to less good-looking result.
+.TP
+.BR \-\-dither " or " \-d
+Use a more complex algorithm which modify surrounding pixels to get a
closer-looking color on average;
+this is slower but provides better looking images.
+.LP
+If none is specified, then it is Window Maker's configuration choice that will
be used.
+
+You can also use the option \fB\-\-colors\fP to reduce the total number of
colors from the \fIimage\fP
+before the algorithm is applied.
+The value specified with the option defines the number of possible values for
each primary color
+(red, green and blue), for example \fI8\fP would reduce the image to use only
8*8*8=512 colors before
+applying the conversion algorithm.
+.SH SEE ALSO
+.BR wmaker (1x)
+.SH AUTHOR
+This man page was written by Marcelo Magallon <mmaga...@debian.org>.
+.PP
+Window Maker was written by Alfredo K. Kojima <koj...@windowmaker.info>.
+wmsetbg was written by Dan Pascu <d...@windowmaker.info>
--
2.1.4
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
