diff options
| author | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2012-08-16 20:47:21 +0200 |
|---|---|---|
| committer | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2012-08-16 20:47:21 +0200 |
| commit | 0d36df3af375046554956c61089c766623104a79 (patch) | |
| tree | e6ecebb6df159947c2e1f0377785fad8fed8ac03 /src/Parsers.hs | |
| parent | fda03ea2bf02f085cd750a4b82a1964c6e8bd138 (diff) | |
| parent | b57de3e23f36756d0ba85a10592dea02561f8b0f (diff) | |
| download | xmobar-0d36df3af375046554956c61089c766623104a79.tar.gz xmobar-0d36df3af375046554956c61089c766623104a79.tar.bz2 | |
Merging github pull request 57
Conflicts:
readme.md
Diffstat (limited to 'src/Parsers.hs')
| -rw-r--r-- | src/Parsers.hs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Parsers.hs b/src/Parsers.hs index c92480e..c658be6 100644 --- a/src/Parsers.hs +++ b/src/Parsers.hs @@ -131,13 +131,14 @@ parseConfig = runParser parseConf fields "Config" . stripComments <$?> pFont <|?> pBgColor <|?> pFgColor <|?> pPosition <|?> pBorder <|?> pBdColor - <|?> pLowerOnStart <|?> pPersistent - <|?> pCommands <|?> pSepChar - <|?> pAlignSep <|?> pTemplate + <|?> pHideOnStart <|?> pLowerOnStart + <|?> pPersistent <|?> pCommands + <|?> pSepChar <|?> pAlignSep + <|?> pTemplate fields = [ "font", "bgColor", "fgColor", "sepChar", "alignSep" , "border", "borderColor" ,"template", "position" - , "lowerOnStart", "persistent", "commands" + , "hideOnStart", "lowerOnStart", "persistent", "commands" ] pFont = strField font "font" @@ -149,6 +150,7 @@ parseConfig = runParser parseConf fields "Config" . stripComments pTemplate = strField template "template" pPosition = field position "position" $ tillFieldEnd >>= read' "position" + pHideOnStart = field hideOnStart "hideOnStart" $ tillFieldEnd >>= read' "hideOnStart" pLowerOnStart = field lowerOnStart "lowerOnStart" $ tillFieldEnd >>= read' "lowerOnStart" pPersistent = field persistent "persistent" $ tillFieldEnd >>= read' "persistent" pBorder = field border "border" $ tillFieldEnd >>= read' "border" |