From 3c4a8174c189b34d978ea67b6d20faeb7eb8f12f Mon Sep 17 00:00:00 2001 From: Alex Tarkovsky Date: Mon, 17 Sep 2007 01:52:29 +0200 Subject: Change manpage token @@ to %! to avoid conflicts with Haddock (xmonad) darcs-hash:20070916235229-bd4fb-a0a20d34ba6fd4acdde2cc3019ca3685bb401018.gz --- util/GenerateManpage.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'util') diff --git a/util/GenerateManpage.hs b/util/GenerateManpage.hs index 5137184..88d4848 100644 --- a/util/GenerateManpage.hs +++ b/util/GenerateManpage.hs @@ -4,14 +4,14 @@ -- -- Format for the docstrings in Config.hs takes the following form: -- --- -- mod-x @@ Frob the whatsit +-- -- mod-x %! Frob the whatsit -- -- "Frob the whatsit" will be used as the description for keybinding "mod-x" -- -- If the keybinding name is omitted, it will try to guess from the rest of the -- line. For example: -- --- [ ((modMask .|. shiftMask, xK_Return), spawn "xterm") -- @@ Launch an xterm +-- [ ((modMask .|. shiftMask, xK_Return), spawn "xterm") -- %! Launch an xterm -- -- Here, mod-shift-return will be used as the keybinding name. -- @@ -32,7 +32,7 @@ binding [ _, bindingLine, "", desc ] = (guessKeys bindingLine, desc) binding [ _, _, keyCombo, desc ] = (keyCombo, desc) allBindings :: String -> [(String, String)] -allBindings xs = map (binding . map trim) (xs =~ "(.*)--(.*)@@(.*)") +allBindings xs = map (binding . map trim) (xs =~ "(.*)--(.*)%!(.*)") -- FIXME: What escaping should we be doing on these strings? troff :: (String, String) -> String -- cgit v1.2.3