diff --git a/XMonad/Core.hs b/XMonad/Core.hs
--- a/XMonad/Core.hs
+++ b/XMonad/Core.hs
@@ -473,5 +473,6 @@
uninstallSignalHandlers :: MonadIO m => m ()
uninstallSignalHandlers = io $ do
+ installHandler openEndedPipe Default Nothing
installHandler sigCHLD Default Nothing
return ()
diff --git a/XMonad/Main.hsc b/XMonad/Main.hsc
--- a/XMonad/Main.hsc
+++ b/XMonad/Main.hsc
@@ -329,7 +329,7 @@
kc <- io $ keysymToKeycode dpy sym
-- "If the specified KeySym is not defined for any KeyCode,
-- XKeysymToKeycode() returns zero."
- when (kc /= '\0') $ mapM_ (grab kc . (mask .|.)) =<< extraModifiers
+ when (kc /= 0) $ mapM_ (grab kc . (mask .|.)) =<< extraModifiers
-- | XXX comment me
grabButtons :: X ()
diff --git a/man/xmonad.1 b/man/xmonad.1
--- a/man/xmonad.1
+++ b/man/xmonad.1
@@ -1,147 +1,267 @@
-./" man page created by David Lazar on April 24, 2007
-./" uses ``tmac.an'' macro set
-.TH xmonad 1 "8 September 09"\
- xmonad-0.9 \
-"xmonad manual"
-.SH NAME
-xmonad \- a tiling window manager
-.SH DESCRIPTION
+.TH xmonad 1 "25 October 09" xmonad-0.9.1 "xmonad manual".SH Name
.PP
-\fBxmonad\fR is a minimalist tiling window manager for X, written in Haskell. Windows are managed using automatic layout algorithms, which can be dynamically reconfigured. At any time windows are arranged so as to maximize the use of screen real estate. All features of the window manager are accessible purely from the keyboard: a mouse is entirely optional. \fBxmonad\fR is configured in Haskell, and custom layout algorithms may be implemented by the user in config files. A principle of \fBxmonad\fR is predictability: the user should know in advance precisely the window arrangement that will result from any action.
+xmonad - a tiling window manager
+.SH Description
.PP
-By default, \fBxmonad\fR provides three layout algorithms: tall, wide and fullscreen. In tall or wide mode, windows are tiled and arranged to prevent overlap and maximize screen use. Sets of windows are grouped together on virtual screens, and each screen retains its own layout, which may be reconfigured dynamically. Multiple physical monitors are supported via Xinerama, allowing simultaneous display of a number of screens.
+\f[I]xmonad\f[] is a minimalist tiling window manager for X,
+written in Haskell.
+Windows are managed using automatic layout algorithms, which can be
+dynamically reconfigured.
+At any time windows are arranged so as to maximize the use of
+screen real estate.
+All features of the window manager are accessible purely from the
+keyboard: a mouse is entirely optional.
+\f[I]xmonad\f[] is configured in Haskell, and custom layout
+algorithms may be implemented by the user in config files.
+A principle of \f[I]xmonad\f[] is predictability: the user should
+know in advance precisely the window arrangement that will result
+from any action.
.PP
-By utilizing the expressivity of a modern functional language with a rich static type system, \fBxmonad\fR provides a complete, featureful window manager in less than 1200 lines of code, with an emphasis on correctness and robustness. Internal properties of the window manager are checked using a combination of static guarantees provided by the type system, and type-based automated testing. A benefit of this is that the code is simple to understand, and easy to modify.
-.SH USAGE
+By default, \f[I]xmonad\f[] provides three layout algorithms: tall,
+wide and fullscreen.
+In tall or wide mode, windows are tiled and arranged to prevent
+overlap and maximize screen use.
+Sets of windows are grouped together on virtual screens, and each
+screen retains its own layout, which may be reconfigured
+dynamically.
+Multiple physical monitors are supported via Xinerama, allowing
+simultaneous display of a number of screens.
.PP
-\fBxmonad\fR places each window into a "workspace". Each workspace can have any number of windows, which you can cycle though with mod-j and mod-k. Windows are either displayed full screen, tiled horizontally, or tiled vertically. You can toggle the layout mode with mod-space, which will cycle through the available modes.
+By utilizing the expressivity of a modern functional language with
+a rich static type system, \f[I]xmonad\f[] provides a complete,
+featureful window manager in less than 1200 lines of code, with an
+emphasis on correctness and robustness.
+Internal properties of the window manager are checked using a
+combination of static guarantees provided by the type system, and
+type-based automated testing.
+A benefit of this is that the code is simple to understand, and
+easy to modify.
+.SH Usage
.PP
-You can switch to workspace N with mod-N. For example, to switch to workspace 5, you would press mod-5. Similarly, you can move the current window to another workspace with mod-shift-N.
+\f[I]xmonad\f[] places each window into a "workspace".
+Each workspace can have any number of windows, which you can cycle
+though with mod-j and mod-k.
+Windows are either displayed full screen, tiled horizontally, or
+tiled vertically.
+You can toggle the layout mode with mod-space, which will cycle
+through the available modes.
.PP
-When running with multiple monitors (Xinerama), each screen has exactly 1 workspace visible. mod-{w,e,r} switch the focus between screens, while shift-mod-{w,e,r} move the current window to that screen. When \fBxmonad\fR starts, workspace 1 is on screen 1, workspace 2 is on screen 2, etc. When switching workspaces to one that is already visible, the current and visible workspaces are swapped.
+You can switch to workspace N with mod-N.
+For example, to switch to workspace 5, you would press mod-5.
+Similarly, you can move the current window to another workspace
+with mod-shift-N.
.PP
+When running with multiple monitors (Xinerama), each screen has
+exactly 1 workspace visible.
+mod-{w,e,r} switch the focus between screens, while
+shift-mod-{w,e,r} move the current window to that screen.
+When \f[I]xmonad\f[] starts, workspace 1 is on screen 1, workspace
+2 is on screen 2, etc.
+When switching workspaces to one that is already visible, the
+current and visible workspaces are swapped.
.SS Flags
-\fBxmonad\fR has several flags which you may pass to the executable. These flags are:
+.PP
+xmonad has several flags which you may pass to the executable.
+These flags are:
.TP
-\fB--recompile
-Recompiles your configuration in ~/.xmonad/xmonad.hs
-\fB--restart
-Causes the currently running xmonad process to restart
+.B --recompile
+Recompiles your configuration in \f[I]~/.xmonad/xmonad.hs\f[]
+.RS
+.RE
.TP
-\fB--version
-Display version of \fBxmonad\fR.
+.B --restart
+Causes the currently running \f[I]xmonad\f[] process to restart
+.RS
+.RE
+.TP
+.B --version
+Display version of \f[I]xmonad\f[]
+.RS
+.RE
.SS Default keyboard bindings
-.IP
- \fBmod-shift-return\fR
+.TP
+.B mod-shift-return
Launch terminal
-.IP
- \fBmod-p\fR
+.RS
+.RE
+.TP
+.B mod-p
Launch dmenu
-.IP
- \fBmod-shift-p\fR
+.RS
+.RE
+.TP
+.B mod-shift-p
Launch gmrun
-.IP
- \fBmod-shift-c\fR
+.RS
+.RE
+.TP
+.B mod-shift-c
Close the focused window
-.IP
- \fBmod-space\fR
+.RS
+.RE
+.TP
+.B mod-space
Rotate through the available layout algorithms
-.IP
- \fBmod-shift-space\fR
+.RS
+.RE
+.TP
+.B mod-shift-space
Reset the layouts on the current workspace to default
-.IP
- \fBmod-n\fR
+.RS
+.RE
+.TP
+.B mod-n
Resize viewed windows to the correct size
-.IP
- \fBmod-tab\fR
+.RS
+.RE
+.TP
+.B mod-tab
Move focus to the next window
-.IP
- \fBmod-shift-tab\fR
+.RS
+.RE
+.TP
+.B mod-shift-tab
Move focus to the previous window
-.IP
- \fBmod-j\fR
+.RS
+.RE
+.TP
+.B mod-j
Move focus to the next window
-.IP
- \fBmod-k\fR
+.RS
+.RE
+.TP
+.B mod-k
Move focus to the previous window
-.IP
- \fBmod-m\fR
+.RS
+.RE
+.TP
+.B mod-m
Move focus to the master window
-.IP
- \fBmod-return\fR
+.RS
+.RE
+.TP
+.B mod-return
Swap the focused window and the master window
-.IP
- \fBmod-shift-j\fR
+.RS
+.RE
+.TP
+.B mod-shift-j
Swap the focused window with the next window
-.IP
- \fBmod-shift-k\fR
+.RS
+.RE
+.TP
+.B mod-shift-k
Swap the focused window with the previous window
-.IP
- \fBmod-h\fR
+.RS
+.RE
+.TP
+.B mod-h
Shrink the master area
-.IP
- \fBmod-l\fR
+.RS
+.RE
+.TP
+.B mod-l
Expand the master area
-.IP
- \fBmod-t\fR
+.RS
+.RE
+.TP
+.B mod-t
Push window back into tiling
-.IP
- \fBmod-comma\fR
+.RS
+.RE
+.TP
+.B mod-comma
Increment the number of windows in the master area
-.IP
- \fBmod-period\fR
+.RS
+.RE
+.TP
+.B mod-period
Deincrement the number of windows in the master area
-.IP
- \fBmod-b\fR
+.RS
+.RE
+.TP
+.B mod-b
Toggle the status bar gap
-.IP
- \fBmod-shift-q\fR
+.RS
+.RE
+.TP
+.B mod-shift-q
Quit xmonad
-.IP
- \fBmod-q\fR
+.RS
+.RE
+.TP
+.B mod-q
Restart xmonad
-.IP
- \fBmod-[1..9]\fR
+.RS
+.RE
+.TP
+.B mod-[1..9]
Switch to workspace N
-.IP
- \fBmod-shift-[1..9]\fR
+.RS
+.RE
+.TP
+.B mod-shift-[1..9]
Move client to workspace N
-.IP
- \fBmod-{w,e,r}\fR
+.RS
+.RE
+.TP
+.B mod-{w,e,r}
Switch to physical/Xinerama screens 1, 2, or 3
-.IP
- \fBmod-shift-{w,e,r}\fR
+.RS
+.RE
+.TP
+.B mod-shift-{w,e,r}
Move client to screen 1, 2, or 3
-.IP
- \fBmod-button1\fR
+.RS
+.RE
+.TP
+.B mod-button1
Set the window to floating mode and move by dragging
-.IP
- \fBmod-button2\fR
+.RS
+.RE
+.TP
+.B mod-button2
Raise the window to the top of the stack
-.IP
- \fBmod-button3\fR
-Set the window to floating mode and resize by dragging
-
-.SH EXAMPLES
-To use \fBxmonad\fR as your window manager add:
.RS
-exec xmonad
.RE
-to your \fI~/.xinitrc\fR file
-.SH CUSTOMIZATION
-\fBxmonad\fR is customized in ~/.xmonad/xmonad.hs, and then restarting with mod-q.
-.PP
-You can find many extensions to the core feature set in the xmonad-contrib package, available through your package manager or from http://xmonad.org/.
-.SS "Modular Configuration"
-As of \fBxmonad-0.9\fR, any additional Haskell modules may be placed in \fI~/.xmonad/lib/\fR are available in GHC's searchpath. Hierarchical modules are supported: for example, the file \fI~/.xmonad/lib/XMonad/Stack/MyAdditions.hs\fR could contain:
+.TP
+.B mod-button3
+Set the window to floating mode and resize by dragging
.RS
-.nf
-
-module XMonad.Stack.MyAdditions (function1) where
-function1 = error "function1: Not implemented yet!"
-.fi
.RE
+.SH Examples
.PP
-Your xmonad.hs may then \fBimport XMonad.Stack.MyAdditions\fR as if that module was contained within \fBxmonad\fR or \fBxmonad-contrib\fR.
-.SH BUGS
-Probably. If you find any, please report them: http://code.google.com/p/xmonad/issues/list
+To use xmonad as your window manager add to your
+\f[I]~/.xinitrc\f[] file:
+.PP
+\f[CR]
+ exec\ xmonad
+\f[]
+.SH Customization
+.PP
+xmonad is customized in ~/.xmonad/xmonad.hs, and then restarting
+with mod-q.
+.PP
+You can find many extensions to the core feature set in the xmonad-
+contrib package, available through your package manager or from
+xmonad.org (http://xmonad.org).
+.SS Modular Configuration
+.PP
+As of \f[I]xmonad-0.9\f[], any additional Haskell modules may be
+placed in \f[I]~/.xmonad/lib/\f[] are available in GHC\[aq]s
+searchpath.
+Hierarchical modules are supported: for example, the file
+\f[I]~/.xmonad/lib/XMonad/Stack/MyAdditions.hs\f[] could contain:
+.PP
+\f[CR]
+ module\ XMonad.Stack.MyAdditions\ (function1)\ where
+ \ \ \ \ function1\ =\ error\ "function1:\ Not\ implemented\ yet!"
+\f[]
+.PP
+Your xmonad.hs may then import XMonad.Stack.MyAdditions as if that
+module was contained within xmonad or xmonad-contrib.
+.SH Bugs
+.PP
+Probably.
+If you find any, please report them to the
+bugtracker (http://code.google.com/p/xmonad/issues/list)
diff --git a/man/xmonad.1.html b/man/xmonad.1.html
new file mode 100644
--- /dev/null
+++ b/man/xmonad.1.html
@@ -0,0 +1,383 @@
+
+xmonad-0.9.1
Section: xmonad manual (1)
Updated: 25 October 09
xmonad - a tiling window manager
xmonad is a minimalist tiling window manager for X, written in Haskell. Windows are managed using automatic layout algorithms, which can be dynamically reconfigured. At any time windows are arranged so as to maximize the use of screen real estate. All features of the window manager are accessible purely from the keyboard: a mouse is entirely optional. xmonad is configured in Haskell, and custom layout algorithms may be implemented by the user in config files. A principle of xmonad is predictability: the user should know in advance precisely the window arrangement that will result from any action.
By default, xmonad provides three layout algorithms: tall, wide and fullscreen. In tall or wide mode, windows are tiled and arranged to prevent overlap and maximize screen use. Sets of windows are grouped together on virtual screens, and each screen retains its own layout, which may be reconfigured dynamically. Multiple physical monitors are supported via Xinerama, allowing simultaneous display of a number of screens.
By utilizing the expressivity of a modern functional language with a rich static type system, xmonad provides a complete, featureful window manager in less than 1200 lines of code, with an emphasis on correctness and robustness. Internal properties of the window manager are checked using a combination of static guarantees provided by the type system, and type-based automated testing. A benefit of this is that the code is simple to understand, and easy to modify.
xmonad places each window into a "workspace". Each workspace can have any number of windows, which you can cycle though with mod-j and mod-k. Windows are either displayed full screen, tiled horizontally, or tiled vertically. You can toggle the layout mode with mod-space, which will cycle through the available modes.
You can switch to workspace N with mod-N. For example, to switch to workspace 5, you would press mod-5. Similarly, you can move the current window to another workspace with mod-shift-N.
When running with multiple monitors (Xinerama), each screen has exactly 1 workspace visible. mod-{w,e,r} switch the focus between screens, while shift-mod-{w,e,r} move the current window to that screen. When xmonad starts, workspace 1 is on screen 1, workspace 2 is on screen 2, etc. When switching workspaces to one that is already visible, the current and visible workspaces are swapped.
xmonad has several flags which you may pass to the executable. These flags are:
- --recompile
Recompiles your configuration in ~/.xmonad/xmonad.hs
- --restart
Causes the currently running xmonad process to restart
- --version
Display version of xmonad
- mod-shift-return
Launch terminal
- mod-p
Launch dmenu
- mod-shift-p
Launch gmrun
- mod-shift-c
Close the focused window
- mod-space
Rotate through the available layout algorithms
- mod-shift-space
Reset the layouts on the current workspace to default
- mod-n
Resize viewed windows to the correct size
- mod-tab
Move focus to the next window
- mod-shift-tab
Move focus to the previous window
- mod-j
Move focus to the next window
- mod-k
Move focus to the previous window
- mod-m
Move focus to the master window
- mod-return
Swap the focused window and the master window
- mod-shift-j
Swap the focused window with the next window
- mod-shift-k
Swap the focused window with the previous window
- mod-h
Shrink the master area
- mod-l
Expand the master area
- mod-t
Push window back into tiling
- mod-comma
Increment the number of windows in the master area
- mod-period
Deincrement the number of windows in the master area
- mod-b
Toggle the status bar gap
- mod-shift-q
Quit xmonad
- mod-q
Restart xmonad
- mod-[1..9]
Switch to workspace N
- mod-shift-[1..9]
Move client to workspace N
- mod-{w,e,r}
Switch to physical/Xinerama screens 1, 2, or 3
- mod-shift-{w,e,r}
Move client to screen 1, 2, or 3
- mod-button1
Set the window to floating mode and move by dragging
- mod-button2
Raise the window to the top of the stack
- mod-button3
Set the window to floating mode and resize by dragging
To use xmonad as your window manager add to your ~/.xinitrc file:
exec xmonad
+
xmonad is customized in ~/.xmonad/xmonad.hs, and then restarting with mod-q.
You can find many extensions to the core feature set in the xmonad- contrib package, available through your package manager or from xmonad.org.
As of xmonad-0.9, any additional Haskell modules may be placed in ~/.xmonad/lib/ are available in GHC's searchpath. Hierarchical modules are supported: for example, the file ~/.xmonad/lib/XMonad/Stack/MyAdditions.hs could contain:
module XMonad.Stack.MyAdditions (function1) where
+ function1 = error "function1: Not implemented yet!"
+
Your xmonad.hs may then import XMonad.Stack.MyAdditions as if that module was contained within xmonad or xmonad-contrib.
Probably. If you find any, please report them to the bugtracker
xmonad
-Section: xmonad manual (1)
Updated: 8 September 09
Index
-Return to Main Contents
-
-
-NAME
-
-xmonad - a tiling window manager
-
-DESCRIPTION
-
-
-
-xmonad is a minimalist tiling window manager for X, written in Haskell. Windows are managed using automatic layout algorithms, which can be dynamically reconfigured. At any time windows are arranged so as to maximize the use of screen real estate. All features of the window manager are accessible purely from the keyboard: a mouse is entirely optional. xmonad is configured in Haskell, and custom layout algorithms may be implemented by the user in config files. A principle of xmonad is predictability: the user should know in advance precisely the window arrangement that will result from any action.
-
-
-By default, xmonad provides three layout algorithms: tall, wide and fullscreen. In tall or wide mode, windows are tiled and arranged to prevent overlap and maximize screen use. Sets of windows are grouped together on virtual screens, and each screen retains its own layout, which may be reconfigured dynamically. Multiple physical monitors are supported via Xinerama, allowing simultaneous display of a number of screens.
-
-
-By utilizing the expressivity of a modern functional language with a rich static type system, xmonad provides a complete, featureful window manager in less than 1200 lines of code, with an emphasis on correctness and robustness. Internal properties of the window manager are checked using a combination of static guarantees provided by the type system, and type-based automated testing. A benefit of this is that the code is simple to understand, and easy to modify.
-
-
USAGE
-
-
-
-xmonad places each window into a "workspace". Each workspace can have any number of windows, which you can cycle though with mod-j and mod-k. Windows are either displayed full screen, tiled horizontally, or tiled vertically. You can toggle the layout mode with mod-space, which will cycle through the available modes.
-
-
-You can switch to workspace N with mod-N. For example, to switch to workspace 5, you would press mod-5. Similarly, you can move the current window to another workspace with mod-shift-N.
-
-
-When running with multiple monitors (Xinerama), each screen has exactly 1 workspace visible. mod-{w,e,r} switch the focus between screens, while shift-mod-{w,e,r} move the current window to that screen. When xmonad starts, workspace 1 is on screen 1, workspace 2 is on screen 2, etc. When switching workspaces to one that is already visible, the current and visible workspaces are swapped.
-
-
-
-
Flags
-
-xmonad has several flags which you may pass to the executable. These flags are:
-
-- --recompile
-
-Recompiles your configuration in ~/.xmonad/xmonad.hs
---restart
-Causes the currently running xmonad process to restart
-
- --version
-
-Display version of xmonad
.
-
-
-Default keyboard bindings
-
-
--
-
mod-shift-return
-Launch terminal
- -
-
mod-p
-Launch dmenu
- -
-
mod-shift-p
-Launch gmrun
- -
-
mod-shift-c
-Close the focused window
- -
-
mod-space
-Rotate through the available layout algorithms
- -
-
mod-shift-space
-Reset the layouts on the current workspace to default
- -
-
mod-n
-Resize viewed windows to the correct size
- -
-
mod-tab
-Move focus to the next window
- -
-
mod-shift-tab
-Move focus to the previous window
- -
-
mod-j
-Move focus to the next window
- -
-
mod-k
-Move focus to the previous window
- -
-
mod-m
-Move focus to the master window
- -
-
mod-return
-Swap the focused window and the master window
- -
-
mod-shift-j
-Swap the focused window with the next window
- -
-
mod-shift-k
-Swap the focused window with the previous window
- -
-
mod-h
-Shrink the master area
- -
-
mod-l
-Expand the master area
- -
-
mod-t
-Push window back into tiling
- -
-
mod-comma
-Increment the number of windows in the master area
- -
-
mod-period
-Deincrement the number of windows in the master area
- -
-
mod-b
-Toggle the status bar gap
- -
-
mod-shift-q
-Quit xmonad
- -
-
mod-q
-Restart xmonad
- -
-
mod-[1..9]
-Switch to workspace N
- -
-
mod-shift-[1..9]
-Move client to workspace N
- -
-
mod-{w,e,r}
-Switch to physical/Xinerama screens 1, 2, or 3
- -
-
mod-shift-{w,e,r}
-Move client to screen 1, 2, or 3
- -
-
mod-button1
-Set the window to floating mode and move by dragging
- -
-
mod-button2
-Raise the window to the top of the stack
- -
-
mod-button3
-Set the window to floating mode and resize by dragging
-
-
-
-EXAMPLES
-
-To use xmonad as your window manager add:
--
-exec xmonad
-
-
-to your ~/.xinitrc file
-
-CUSTOMIZATION
-
-xmonad is customized in ~/.xmonad/xmonad.hs, and then restarting with mod-q.
-
-
-You can find many extensions to the core feature set in the xmonad-contrib package, available through your package manager or from http://xmonad.org/.
-
-
Modular Configuration
-
-As of xmonad-0.9, any additional Haskell modules may be placed in ~/.xmonad/lib/ are available in GHC's searchpath. Hierarchical modules are supported: for example, the file ~/.xmonad/lib/XMonad/Stack/MyAdditions.hs could contain:
--
-
-
-module XMonad.Stack.MyAdditions (function1) where
-function1 = error "function1: Not implemented yet!"
-
-
-
-
-
-
-Your xmonad.hs may then import XMonad.Stack.MyAdditions as if that module was contained within xmonad or xmonad-contrib.
-
-
BUGS
-
-Probably. If you find any, please report them: http://code.google.com/p/xmonad/issues/list
-
-
-
- Index
-
-- NAME
-
-
- DESCRIPTION
-
-
- USAGE
-
-
-- Flags
-
-
- Default keyboard bindings
-
-
- - EXAMPLES
-
-
- CUSTOMIZATION
-
-
-- Modular Configuration
-
-
- - BUGS
-
-
-
-This document was created by
-man2html,
-using the manual pages.
-Time: 00:37:30 GMT, October 26, 2009
-
-
diff --git a/util/GenerateManpage.hs b/util/GenerateManpage.hs
--- a/util/GenerateManpage.hs
+++ b/util/GenerateManpage.hs
@@ -1,7 +1,14 @@
+-- Unlike the rest of xmonad, this file is copyright under the terms of the
+-- GPL.
+
--
-- Generates man/xmonad.1 from man/xmonad.1.in by filling the list of
-- keybindings with values scraped from Config.hs
--
+-- Uses cabal to grab the xmonad version from xmonad.cabal
+--
+-- Uses pandoc to convert the "xmonad.1.markdown" to "xmonad.1"
+--
-- Format for the docstrings in Config.hs takes the following form:
--
-- -- mod-x %! Frob the whatsit
@@ -14,8 +21,8 @@
-- [ ((modMask .|. shiftMask, xK_Return), spawn "xterm") -- %! Launch an xterm
--
-- Here, mod-shift-return will be used as the keybinding name.
---
import Control.Monad
+import Control.Applicative
import Text.Regex.Posix
import Data.Char
import Data.List
@@ -27,6 +34,10 @@
import Text.PrettyPrint.HughesPJ
import Distribution.Text
+import Text.Pandoc
+
+releaseDate = "25 October 09"
+
trim :: String -> String
trim = reverse . dropWhile isSpace . reverse . dropWhile isSpace
@@ -42,16 +53,42 @@
allBindings xs = map (binding . map trim) (xs =~ "(.*)--(.*)%!(.*)")
-- FIXME: What escaping should we be doing on these strings?
-troff :: (String, String) -> String
-troff (key, desc) = ".IP\n \\fB" ++ key ++ "\\fR\n" ++ desc ++ "\n"
+markdownDefn :: (String, String) -> String
+markdownDefn (key, desc) = key ++ "\n: " ++ desc
replace :: Eq a => a -> a -> [a] -> [a]
replace x y = map (\a -> if a == x then y else a)
+-- rawSystem "pandoc" ["--read=markdown","--write=man","man/xmonad.1.markdown"]
+
main = do
- releaseName <- ((' ':) . (++" \\") . show . disp . package . packageDescription) `liftM` readPackageDescription normal "xmonad.cabal"
+ releaseName <- (show . disp . package . packageDescription)
+ `liftM`readPackageDescription normal "xmonad.cabal"
+ keybindings <- (intercalate "\n\n" . map markdownDefn . allBindings)
+ `liftM` readFile "./XMonad/Config.hs"
- troffBindings <- (concatMap troff . allBindings) `liftM` readFile "./XMonad/Config.hs"
+ let manHeader = unwords [".TH xmonad 1","\""++releaseDate++"\"",releaseName,"\"xmonad manual\""]
+ writeOpts = defaultWriterOptions -- { writerLiterateHaskell = True }
- let sed = unlines . replace "___RELEASE___\\" releaseName . replace "___KEYBINDINGS___" troffBindings . lines
- readFile "./man/xmonad.1.in" >>= return . sed >>= writeFile "./man/xmonad.1"
+ parsed <- readMarkdown defaultParserState { stateLiterateHaskell = True }
+ . unlines
+ . replace "___KEYBINDINGS___" keybindings
+ . lines
+ <$> readFile "./man/xmonad.1.markdown"
+
+ writeFile "./man/xmonad.1"
+ . (manHeader ++)
+ . writeMan writeOpts
+ $ parsed
+ putStrLn "Documentation created: man/xmonad.1"
+
+ writeFile "./man/xmonad.1.html"
+ . writeHtmlString writeOpts
+ { writerHeader = ""++releaseName++"
"++
+ "Section: xmonad manual (1)
"++
+ "Updated: "++releaseDate++"
"++
+ "
"
+ , writerStandalone = True
+ , writerTableOfContents = True }
+ $ parsed
+ putStrLn "Documentation created: man/xmonad.1.html"
diff --git a/xmonad.cabal b/xmonad.cabal
--- a/xmonad.cabal
+++ b/xmonad.cabal
@@ -1,5 +1,5 @@
name: xmonad
-version: 0.9
+version: 0.9.1
homepage: http://xmonad.org
synopsis: A tiling window manager
description:
@@ -18,7 +18,7 @@
author: Spencer Janssen
maintainer: xmonad@haskell.org
extra-source-files: README TODO CONFIG STYLE tests/loc.hs tests/Properties.hs
- man/xmonad.1.in man/xmonad.1 man/xmonad.html
+ man/xmonad.1.markdown man/xmonad.1 man/xmonad.1.html
util/GenerateManpage.hs
cabal-version: >= 1.2
build-type: Simple
@@ -46,7 +46,7 @@
build-depends: base < 4 && >=3, containers, directory, process, filepath
else
build-depends: base < 3
- build-depends: X11>=1.4.6.1, mtl, unix
+ build-depends: X11>=1.5.0.0 && < 1.6, mtl, unix
ghc-options: -funbox-strict-fields -Wall
ghc-prof-options: -prof -auto-all