diff --git a/CHANGES b/CHANGES --- a/CHANGES +++ b/CHANGES @@ -2,14 +2,33 @@ See also the hledger and project change logs. +# 1.3.1 (2017/8/25) + +* allow megaparsec 6 (#594, Simon Michael, Hans-Peter Deifel) + +* allow megaparsec-6.1 (Hans-Peter Deifel) + +* allow vty 5.17 (Felix Yan) + +* allow brick 0.24 + +* restore upper bounds on hledger packages + + # 1.3 (2017/6/30) -Deps: allow brick 0.19 (#575, Felix Yan, Simon Michael) +The register screen now shows transaction status marks. -The P key toggles pending mode. -Also there is a temporary --status-toggles flag for testing different -toggle styles, see `hledger-ui -h`. (#564) +The "uncleared" status, and associated UI flags and keys, have been +renamed to "unmarked" to remove ambiguity and confusion. This means +that we have dropped the `--uncleared` flag, and our `-U` flag now +matches only unmarked things and not pending ones. See the issue and +linked mail list discussion for more background. (#564) +The P key toggles pending mode, consistent with U (unmarked) and C +(cleared). There is also a temporary --status-toggles flag for testing +other toggle styles; see `hledger-ui -h`. (#564) + There is now less "warping" of selection when lists change: - When the selected account disappears, eg when toggling zero @@ -23,8 +42,8 @@ In the accounts and register screens, you can now scroll down further so that the last item need not always be shown at the bottom of the -screen. Also we now try to center the selected item in the following -situations: +screen. And we now try to show the selected item centered in the +following situations: - after moving to the end with Page down/End - after toggling filters (status, real, historical..) @@ -32,16 +51,16 @@ - on entering the register screen from the accounts screen (there's a known problem with this: it doesn't work the first time). -Items near the top of the list can't be centered, as we don't scroll -higher than the top of the list. +(Items near the top can't be centered, as we don't scroll higher than +the top of the list.) Emacs movement keys are now supported, as well as VI keys. hjkl and CTRL-bfnp should work wherever unmodified arrow keys work. -The register screen now shows transaction status marks. - In the transaction screen, amounts are now better aligned, eg when there are posting status marks or virtual postings. + +Deps: allow brick 0.19 (#575, Felix Yan, Simon Michael) # 1.2 (2017/3/31) diff --git a/Hledger/UI/ErrorScreen.hs b/Hledger/UI/ErrorScreen.hs --- a/Hledger/UI/ErrorScreen.hs +++ b/Hledger/UI/ErrorScreen.hs @@ -17,7 +17,7 @@ import Data.Monoid import Data.Time.Calendar (Day) import Graphics.Vty (Event(..),Key(..)) -import Text.Megaparsec +import Text.Megaparsec.Compat import Hledger.Cli hiding (progname,prognameandversion,green) import Hledger.UI.UIOptions @@ -105,7 +105,7 @@ -- | Parse the file name, line and column number from a hledger parse error message, if possible. -- Temporary, we should keep the original parse error location. XXX -hledgerparseerrorpositionp :: ParsecT Dec String t (String, Int, Int) +hledgerparseerrorpositionp :: ParsecT MPErr String t (String, Int, Int) hledgerparseerrorpositionp = do anyChar `manyTill` char '"' f <- anyChar `manyTill` (oneOf ['"','\n']) diff --git a/doc/hledger-ui.1 b/doc/hledger-ui.1 --- a/doc/hledger-ui.1 +++ b/doc/hledger-ui.1 @@ -1,5 +1,5 @@ -.TH "hledger\-ui" "1" "June 2017" "hledger\-ui 1.3" "hledger User Manuals" +.TH "hledger\-ui" "1" "August 2017" "hledger\-ui 1.3.1" "hledger User Manuals" diff --git a/doc/hledger-ui.1.info b/doc/hledger-ui.1.info --- a/doc/hledger-ui.1.info +++ b/doc/hledger-ui.1.info @@ -3,8 +3,8 @@  File: hledger-ui.1.info, Node: Top, Next: OPTIONS, Up: (dir) -hledger-ui(1) hledger-ui 1.3 -**************************** +hledger-ui(1) hledger-ui 1.3.1 +****************************** hledger-ui is hledger's curses-style interface, providing an efficient full-window text UI for viewing accounts and transactions, and some @@ -365,19 +365,19 @@  Tag Table: Node: Top73 -Node: OPTIONS825 -Ref: #options924 -Node: KEYS3665 -Ref: #keys3762 -Node: SCREENS6558 -Ref: #screens6645 -Node: Accounts screen6735 -Ref: #accounts-screen6865 -Node: Register screen9095 -Ref: #register-screen9252 -Node: Transaction screen11326 -Ref: #transaction-screen11486 -Node: Error screen12356 -Ref: #error-screen12480 +Node: OPTIONS829 +Ref: #options928 +Node: KEYS3669 +Ref: #keys3766 +Node: SCREENS6562 +Ref: #screens6649 +Node: Accounts screen6739 +Ref: #accounts-screen6869 +Node: Register screen9099 +Ref: #register-screen9256 +Node: Transaction screen11330 +Ref: #transaction-screen11490 +Node: Error screen12360 +Ref: #error-screen12484  End Tag Table diff --git a/doc/hledger-ui.1.txt b/doc/hledger-ui.1.txt --- a/doc/hledger-ui.1.txt +++ b/doc/hledger-ui.1.txt @@ -369,4 +369,4 @@ -hledger-ui 1.3 June 2017 hledger-ui(1) +hledger-ui 1.3.1 August 2017 hledger-ui(1) diff --git a/hledger-ui.cabal b/hledger-ui.cabal --- a/hledger-ui.cabal +++ b/hledger-ui.cabal @@ -1,9 +1,9 @@ --- This file has been generated from package.yaml by hpack version 0.17.0. +-- This file has been generated from package.yaml by hpack version 0.17.1. -- -- see: https://github.com/sol/hpack name: hledger-ui -version: 1.3 +version: 1.3.1 synopsis: Curses-style user interface for the hledger accounting tool description: This is hledger's curses-style interface. It is simpler and more convenient for browsing data than the command-line interface, @@ -55,10 +55,10 @@ hs-source-dirs: ./. ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans - cpp-options: -DVERSION="1.3" + cpp-options: -DVERSION="1.3.1" build-depends: - hledger >= 1.3 - , hledger-lib >= 1.3 + hledger >= 1.3.1 && < 1.4 + , hledger-lib >= 1.3.1 && < 1.4 , ansi-terminal >= 0.6.2.3 && < 0.7 , async , base >= 4.8 && < 5 @@ -72,7 +72,7 @@ , HUnit , microlens >= 0.4 && < 0.5 , microlens-platform >= 0.2.3.1 && < 0.4 - , megaparsec >=5.0 && < 5.4 + , megaparsec >=5.0 && < 6.2 , pretty-show >=1.6.4 , process >= 1.2 , safe >= 0.2 @@ -85,8 +85,8 @@ buildable: False else build-depends: - brick >= 0.12 && < 0.20 - , vty >= 5.5 && < 5.16 + brick >= 0.12 && < 0.25 + , vty >= 5.5 && < 5.18 if flag(threaded) ghc-options: -threaded if flag(oldtime)