diff options
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | doc/DEVELOP.md.new | 0 | ||||
| -rw-r--r-- | doc/ledger.1 | 26 | ||||
| -rw-r--r-- | doc/ledger3.texi | 36 | ||||
| -rw-r--r-- | lisp/ledger-fontify.el | 1 | ||||
| -rw-r--r-- | test/unit/t_balance.cc | 3 |
6 files changed, 37 insertions, 38 deletions
diff --git a/.travis.yml b/.travis.yml index 59501f68..9c6a1910 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,17 +18,16 @@ before_install: install: # Install GNU GCC 4.8 required by use of C++11 - - sudo apt-get install -qq g++-4.8 gcc-4.8 - - export CXX="g++-4.8" CC="gcc-4.8" + - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.8 gcc-4.8; fi + - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi # Install Ledger dependencies - sudo apt-get install -qq libboost1.55 libgmp-dev libmpfr-dev libeditline-dev before_script: - - export JOBS=2 - - ./acprep opt make --jobs $JOBS --python + - ./acprep opt make --python script: - - ./acprep check --jobs $JOBS -- --output-on-failure + - ./acprep check --jobs $(nproc) -- --output-on-failure - PYTHONPATH=. python python/demo.py notifications: diff --git a/doc/DEVELOP.md.new b/doc/DEVELOP.md.new deleted file mode 100644 index e69de29b..00000000 --- a/doc/DEVELOP.md.new +++ /dev/null diff --git a/doc/ledger.1 b/doc/ledger.1 index b4746eb9..6995e2c8 100644 --- a/doc/ledger.1 +++ b/doc/ledger.1 @@ -333,7 +333,7 @@ Anonymize registry output, mostly for sending in bug reports. .It Fl \-auto-match .It Fl \-aux-date Show auxiliary dates for all calculations. -Alias for +Alias for .Fl \-effective .It Fl \-average Pq Fl A Print average values over the number of transactions instead of @@ -408,7 +408,7 @@ Shorthand for .Nm --limit 'date <= today' . .It Fl \-daily Pq Fl D Shorthand for -.Nm --period 'daily' . +.Nm --period Ar 'daily' . .It Fl \-date Ar EXPR Transform the date of the transaction using .Ar EXPR . @@ -501,7 +501,7 @@ Print the first .Ar INT entries. Opposite of .Fl \-tail Ar INT . -Alias for +Alias for .Fl \-head . .It Fl \-flat Force the full names of accounts to be used in the balance report. The @@ -582,7 +582,7 @@ report. Alias for .Fl \-tail . .It Fl \-leeway Ar INT Pq Fl Z -Alias for +Alias for .Fl \-price-expr . .It Fl \-limit Ar EXPR Pq Fl l Limit postings in calculations. @@ -612,7 +612,7 @@ Specify the width of the Meta column used for the options. .It Fl \-monthly Pq Fl M Shorthand for -.Fl \-period 'monthly' . +.Fl \-period Ar 'monthly' . .It Fl \-no-aliases Aliases are completely ignored. .It Fl \-no-color @@ -714,7 +714,7 @@ Show primary dates for all calculations. Alias for Report commodity totals (this is the default). .It Fl \-quarterly Synonym for -\Fl \-period 'quarterly' . +\Fl \-period Ar 'quarterly' . .It Fl \-raw In the .Nm print @@ -739,7 +739,7 @@ of the transaction. .It Fl \-related-all Show all postings in a transaction, similar to .Fl \-related -but show +but show .Nm both sides of each transaction. .It Fl \-revalued @@ -834,12 +834,12 @@ ledger will produce memory trace information. Print version information and exit. .It Fl \-weekly Pq Fl W Synonym for -.Fl \-period 'weekly' . +.Fl \-period Ar 'weekly' . .It Fl \-wide Pq Fl w Assume 132 columns instead of 80. .It Fl \-yearly Pq Fl Y Synonym for -.Fl \-period 'yearly' . +.Fl \-period Ar 'yearly' . .El .Pp .Sh PRE-COMMANDS @@ -868,8 +868,8 @@ Evaluate the given period and report how Ledger interprets it. .It Nm script .It Nm template Shows the insertion template that the -.Nm xact sub-command generates. -This is a debugging command. +.Nm xact +sub-command generates. This is a debugging command. .El .Pp .Sh QUERIES @@ -984,7 +984,7 @@ for example: .Pp .Sh ENTRIES .Pp -.Sh FORMATS +.Sh FORMATS .Pp .Sh DEBUG COMMANDS In addition to the regular reporting commands, Ledger also accepts several @@ -1033,7 +1033,7 @@ and displays information about how it was parsed. See the section on .El .Pp .Sh SEE ALSO -.Xr beancount 1, +.Xr beancount 1 , .Xr hledger 1 .Sh AUTHORS .An "John Wiegley" diff --git a/doc/ledger3.texi b/doc/ledger3.texi index 8df5edc0..1d88df53 100644 --- a/doc/ledger3.texi +++ b/doc/ledger3.texi @@ -5770,31 +5770,27 @@ Specify the location of the init file. The default is @file{~/.ledgerrc}. Display the options in effect for this Ledger invocation, along with their values and the source of those values, for example: -@smallexample -$ ledger --options bal --cleared -f ~/ledger/test/input/drewr3.dat -=========================================================================== +@smallexample @c command:A9349E4,with_input:03ACB97 +$ ledger --options bal --cleared +@end smallexample + +@smallexample @c output:A9349E4 +=============================================================================== [Global scope options] + --args-only --args-only [Session scope options] - --file = ~/ledger/test/input/drewr3.dat -f - --price-db = ~/FinanceData/PriceDB $price-db + --file = A9349E4.dat --file [Report scope options] - --cleared --cleared - --color ?normalize - --date-format = %Y/%m/%d $date-format - --limit = cleared --cleared - --prepend-width = 0 ?normalize - --meta-width = 0 ?normalize - --date-width = 10 ?normalize - --payee-width = 21 ?normalize - --account-width = 21 ?normalize - --amount-width = 12 ?normalize - --total-width = 12 ?normalize -=========================================================================== - $ 775.00 Assets:Checking - $ -1,000.00 Equity:Opening Balances - $ 225.00 Expenses:Food:Groceries + --cleared --cleared + --columns = 80 --columns + --limit = cleared --cleared +=============================================================================== + $15.00 Expenses + $12.45 Food + $2.55 Tips + $-15.00 Liabilities:MasterCard -------------------- 0 @end smallexample diff --git a/lisp/ledger-fontify.el b/lisp/ledger-fontify.el index d307208f..8dbe1bd5 100644 --- a/lisp/ledger-fontify.el +++ b/lisp/ledger-fontify.el @@ -42,6 +42,7 @@ (save-excursion (unless beg (setq beg (point-min))) (unless end (setq end (point-max))) + (goto-char beg) (beginning-of-line) (while (< (point) end) (cond ((or (looking-at ledger-xact-start-regex) diff --git a/test/unit/t_balance.cc b/test/unit/t_balance.cc index c4ec2f31..b503d02a 100644 --- a/test/unit/t_balance.cc +++ b/test/unit/t_balance.cc @@ -178,7 +178,10 @@ BOOST_AUTO_TEST_CASE(testEqaulity) BOOST_CHECK(b4 == b5); +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-value" BOOST_CHECK_THROW(b0 == a0, balance_error); +#pragma GCC diagnostic pop BOOST_CHECK(b0.valid()); BOOST_CHECK(b1.valid()); |