slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '486cc47'

Browse Source
This commit is contained in:
Simon Michael 2017-01-05 17:17:02 -08:00
commit 7f58d186bb
15 changed files with 4310 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hledger-ui/Hledger/UI/UIOptions.hs
View File

@ -26,7 +26,7 @@ prognameandversion = progname ++ " " ++ version :: String
uiflags = [ uiflags = [
-- flagNone ["debug-ui"] (\opts -> setboolopt "rules-file" opts) "run with no terminal output, showing console" -- flagNone ["debug-ui"] (\opts -> setboolopt "rules-file" opts) "run with no terminal output, showing console"
flagNone ["watch"] (\opts -> setboolopt "watch" opts) "watch for data changes and reload automatically" flagNone ["watch"] (\opts -> setboolopt "watch" opts) "watch for data and date changes and reload automatically"
,flagReq ["theme"] (\s opts -> Right $ setopt "theme" s opts) "THEME" ("use this custom display theme ("++intercalate ", " themeNames++")") ,flagReq ["theme"] (\s opts -> Right $ setopt "theme" s opts) "THEME" ("use this custom display theme ("++intercalate ", " themeNames++")")
,flagReq ["register"] (\s opts -> Right $ setopt "register" s opts) "ACCTREGEX" "start in the (first) matched account's register" ,flagReq ["register"] (\s opts -> Right $ setopt "register" s opts) "ACCTREGEX" "start in the (first) matched account's register"
,flagNone ["change"] (\opts -> setboolopt "change" opts) ,flagNone ["change"] (\opts -> setboolopt "change" opts)
@ -38,7 +38,7 @@ uiflags = [
,flagNone ["flat"] (\opts -> setboolopt "flat" opts) "show full account names, unindented" ,flagNone ["flat"] (\opts -> setboolopt "flat" opts) "show full account names, unindented"
-- ,flagReq ["drop"] (\s opts -> Right $ setopt "drop" s opts) "N" "with --flat, omit this many leading account name components" -- ,flagReq ["drop"] (\s opts -> Right $ setopt "drop" s opts) "N" "with --flat, omit this many leading account name components"
-- ,flagReq ["format"] (\s opts -> Right $ setopt "format" s opts) "FORMATSTR" "use this custom line format" -- ,flagReq ["format"] (\s opts -> Right $ setopt "format" s opts) "FORMATSTR" "use this custom line format"
,flagNone ["no-elide"] (\opts -> setboolopt "no-elide" opts) "don't compress empty parent accounts on one line" -- ,flagNone ["no-elide"] (\opts -> setboolopt "no-elide" opts) "don't compress empty parent accounts on one line"
,flagNone ["value","V"] (setboolopt "value") "show amounts as their current market value in their default valuation commodity (accounts screen)" ,flagNone ["value","V"] (setboolopt "value") "show amounts as their current market value in their default valuation commodity (accounts screen)"
] ]

2
hledger-ui/doc/hledger-ui.1.m4.md
View File

@ -50,7 +50,7 @@ Note: if invoking hledger-ui as a hledger subcommand, write `--` before options
Any QUERYARGS are interpreted as a hledger search query which filters the data. Any QUERYARGS are interpreted as a hledger search query which filters the data.
`--watch` `--watch`
: watch for data (and time) changes and reload automatically : watch for data and date changes and reload automatically
`--theme=default|terminal|greenterm` `--theme=default|terminal|greenterm`
: use this custom display theme : use this custom display theme

11
hledger-web/doc/hledger-web.1.m4.md
View File

@ -111,14 +111,17 @@ hledger-web will show an error until the file has been fixed.
Note: if invoking hledger-web as a hledger subcommand, write `--` before options as shown above. Note: if invoking hledger-web as a hledger subcommand, write `--` before options as shown above.
`--server` `--serve`
: disable browser-opening and auto-exit-on-idle, and log all requests to stdout : serve and log requests, don't browse or auto-exit
`--host=IPADDR`
: listen on this IP address (default: 127.0.0.1)
`--port=PORT` `--port=PORT`
: set the TCP port to listen on (default: 5000) : listen on this TCP port (default: 5000)
`--base-url=URL` `--base-url=URL`
: set the base url (default: http://localhost:PORT). : set the base url (default: http://IPADDR:PORT).
You would change this when sharing over the network, or integrating within a larger website. You would change this when sharing over the network, or integrating within a larger website.
`--file-url=URL` `--file-url=URL`

139
site/css/syntax.css Normal file
View File

@ -0,0 +1,139 @@
/* Generated with pandoc --highlight-style=X */
/* pygments */
/*
table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode, table.sourceCode pre
{ margin: 0; padding: 0; border: 0; vertical-align: baseline; border: none; }
td.lineNumbers { border-right: 1px solid #AAAAAA; text-align: right; color: #AAAAAA; padding-right: 5px; padding-left: 5px; }
td.sourceCode { padding-left: 5px; }
pre.sourceCode span.kw { color: #007020; font-weight: bold; }
pre.sourceCode span.dt { color: #902000; }
pre.sourceCode span.dv { color: #40a070; }
pre.sourceCode span.bn { color: #40a070; }
pre.sourceCode span.fl { color: #40a070; }
pre.sourceCode span.ch { color: #4070a0; }
pre.sourceCode span.st { color: #4070a0; }
pre.sourceCode span.co { color: #60a0b0; font-style: italic; }
pre.sourceCode span.ot { color: #007020; }
pre.sourceCode span.al { color: red; font-weight: bold; }
pre.sourceCode span.fu { color: #06287e; }
pre.sourceCode span.re { }
pre.sourceCode span.er { color: red; font-weight: bold; }
*/
/* kate */
/*
table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode {
margin: 0; padding: 0; vertical-align: baseline; border: none; }
table.sourceCode { width: 100%; line-height: 100%; }
td.lineNumbers { text-align: right; padding-right: 4px; padding-left: 4px; background-color: #dddddd; }
td.sourceCode { padding-left: 5px; }
code > span.kw { font-weight: bold; }
code > span.dt { color: #800000; }
code > span.dv { color: #0000ff; }
code > span.bn { color: #0000ff; }
code > span.fl { color: #800080; }
code > span.ch { color: #ff00ff; }
code > span.st { color: #dd0000; }
code > span.co { color: #808080; font-style: italic; }
code > span.al { color: #00ff00; font-weight: bold; }
code > span.fu { color: #000080; }
code > span.er { color: #ff0000; font-weight: bold; }
*/
/* monochrome */
/*
table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode {
margin: 0; padding: 0; vertical-align: baseline; border: none; }
table.sourceCode { width: 100%; line-height: 100%; }
td.lineNumbers { text-align: right; padding-right: 4px; padding-left: 4px; }
td.sourceCode { padding-left: 5px; }
code > span.kw { font-weight: bold; }
code > span.dt { text-decoration: underline; }
code > span.co { font-style: italic; }
code > span.al { font-weight: bold; }
code > span.er { font-weight: bold; }
*/
/* espresso */
/*
table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode {
margin: 0; padding: 0; vertical-align: baseline; border: none; }
table.sourceCode { width: 100%; line-height: 100%; background-color: #2a211c; color: #bdae9d; }
td.lineNumbers { text-align: right; padding-right: 4px; padding-left: 4px; background-color: #2a211c; color: #bdae9d; border-right: 1px solid #bdae9d; }
td.sourceCode { padding-left: 5px; }
pre, code { color: #bdae9d; background-color: #2a211c; }
code > span.kw { color: #43a8ed; font-weight: bold; }
code > span.dt { text-decoration: underline; }
code > span.dv { color: #44aa43; }
code > span.bn { color: #44aa43; }
code > span.fl { color: #44aa43; }
code > span.ch { color: #049b0a; }
code > span.st { color: #049b0a; }
code > span.co { color: #0066ff; font-style: italic; }
code > span.al { color: #ffff00; }
code > span.fu { color: #ff9358; font-weight: bold; }
code > span.er { font-weight: bold; }
*/
/* zenburn */
/*
table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode {
margin: 0; padding: 0; vertical-align: baseline; border: none; }
table.sourceCode { width: 100%; line-height: 100%; background-color: #303030; color: #cccccc; }
td.lineNumbers { text-align: right; padding-right: 4px; padding-left: 4px; }
td.sourceCode { padding-left: 5px; }
pre, code { color: #cccccc; background-color: #303030; }
code > span.kw { color: #f0dfaf; }
code > span.dt { color: #dfdfbf; }
code > span.dv { color: #dcdccc; }
code > span.bn { color: #dca3a3; }
code > span.fl { color: #c0bed1; }
code > span.ch { color: #dca3a3; }
code > span.st { color: #cc9393; }
code > span.co { color: #7f9f7f; }
code > span.ot { color: #efef8f; }
code > span.al { color: #ffcfaf; }
code > span.fu { color: #efef8f; }
code > span.er { color: #c3bf9f; }
*/
/* haddock */
/*
table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode {
margin: 0; padding: 0; vertical-align: baseline; border: none; }
table.sourceCode { width: 100%; line-height: 100%; }
td.lineNumbers { text-align: right; padding-right: 4px; padding-left: 4px; color: #aaaaaa; border-right: 1px solid #aaaaaa; }
td.sourceCode { padding-left: 5px; }
code > span.kw { color: #0000ff; }
code > span.ch { color: #008080; }
code > span.st { color: #008080; }
code > span.co { color: #008000; }
code > span.ot { color: #ff4000; }
code > span.al { color: #ff0000; }
code > span.er { font-weight: bold; }
*/
/* tango */
table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode {
margin: 0; padding: 0; vertical-align: baseline; border: none; }
table.sourceCode { width: 100%; line-height: 100%; background-color: #f8f8f8; }
td.lineNumbers { text-align: right; padding-right: 4px; padding-left: 4px; color: #aaaaaa; border-right: 1px solid #aaaaaa; }
td.sourceCode { padding-left: 5px; }
pre, code { background-color: #f8f8f8; }
code > span.kw { color: #204a87; font-weight: bold; }
code > span.dt { color: #204a87; }
code > span.dv { color: #0000cf; }
code > span.bn { color: #0000cf; }
code > span.fl { color: #0000cf; }
code > span.ch { color: #4e9a06; }
code > span.st { color: #4e9a06; }
code > span.co { color: #8f5902; font-style: italic; }
code > span.ot { color: #8f5902; }
code > span.al { color: #ef2929; }
code > span.fu { color: #000000; }
code > span.er { font-weight: bold; }
*/

2
site/doc/1.1/csv.md
View File

@ -1,6 +1,6 @@
# csv format # csv format
This doc is for version **1.1**. <span class="docversions"></span> This doc is for version **dev**. <span class="docversions"></span>
- toc - toc

2
site/doc/1.1/hledger-api.md
View File

@ -1,6 +1,6 @@
# hledger-api # hledger-api
This doc is for version **1.1**. <span class="docversions"></span> This doc is for version **dev**. <span class="docversions"></span>
- toc - toc

4
site/doc/1.1/hledger-ui.md
View File

@ -1,6 +1,6 @@
# hledger-ui # hledger-ui
This doc is for version **1.1**. <span class="docversions"></span> This doc is for version **dev**. <span class="docversions"></span>
- toc - toc
<style> <style>
@ -54,7 +54,7 @@ Any QUERYARGS are interpreted as a hledger search query which filters
the data. the data.
`--watch` `--watch`
: watch for data (and time) changes and reload automatically : watch for data and date changes and reload automatically
`--theme=default|terminal|greenterm` `--theme=default|terminal|greenterm`
: use this custom display theme : use this custom display theme

14
site/doc/1.1/hledger-web.md
View File

@ -1,6 +1,6 @@
# hledger-web # hledger-web
This doc is for version **1.1**. <span class="docversions"></span> This doc is for version **dev**. <span class="docversions"></span>
- toc - toc
@ -99,15 +99,17 @@ will show an error until the file has been fixed.
Note: if invoking hledger-web as a hledger subcommand, write `--` before Note: if invoking hledger-web as a hledger subcommand, write `--` before
options as shown above. options as shown above.
`--server` `--serve`
: disable browser-opening and auto-exit-on-idle, and log all requests : serve and log requests, don't browse or auto-exit
to stdout
`--host=IPADDR`
: listen on this IP address (default: 127.0.0.1)
`--port=PORT` `--port=PORT`
: set the TCP port to listen on (default: 5000) : listen on this TCP port (default: 5000)
`--base-url=URL` `--base-url=URL`
: set the base url (default: http://localhost:PORT). You would change : set the base url (default: http://IPADDR:PORT). You would change
this when sharing over the network, or integrating within a this when sharing over the network, or integrating within a
larger website. larger website.

2
site/doc/1.1/hledger.md
View File

@ -1,6 +1,6 @@
# hledger # hledger
This doc is for version **1.1**. <span class="docversions"></span> This doc is for version **dev**. <span class="docversions"></span>
- toc - toc

2
site/doc/1.1/journal.md
View File

@ -1,6 +1,6 @@
# journal format # journal format
This doc is for version **1.1**. <span class="docversions"></span> This doc is for version **dev**. <span class="docversions"></span>
- toc - toc

30
site/doc/1.1/manual.md
View File

@ -4,7 +4,7 @@
## hledger ## hledger
This doc is for version **1.1**. <span class="docversions"></span> This doc is for version **dev**. <span class="docversions"></span>
### NAME ### NAME
@ -2114,7 +2114,7 @@ set LANG to something other than C.
## hledger-ui ## hledger-ui
This doc is for version **1.1**. <span class="docversions"></span> This doc is for version **dev**. <span class="docversions"></span>
- <style> - <style>
.highslide img {max-width:250px; float:right; margin:0 0 1em 1em;} .highslide img {max-width:250px; float:right; margin:0 0 1em 1em;}
@ -2167,7 +2167,7 @@ Any QUERYARGS are interpreted as a hledger search query which filters
the data. the data.
`--watch` `--watch`
: watch for data (and time) changes and reload automatically : watch for data and date changes and reload automatically
`--theme=default|terminal|greenterm` `--theme=default|terminal|greenterm`
: use this custom display theme : use this custom display theme
@ -2493,7 +2493,7 @@ program is restarted.
## hledger-web ## hledger-web
This doc is for version **1.1**. <span class="docversions"></span> This doc is for version **dev**. <span class="docversions"></span>
### NAME ### NAME
@ -2590,15 +2590,17 @@ will show an error until the file has been fixed.
Note: if invoking hledger-web as a hledger subcommand, write `--` before Note: if invoking hledger-web as a hledger subcommand, write `--` before
options as shown above. options as shown above.
`--server` `--serve`
: disable browser-opening and auto-exit-on-idle, and log all requests : serve and log requests, don't browse or auto-exit
to stdout
`--host=IPADDR`
: listen on this IP address (default: 127.0.0.1)
`--port=PORT` `--port=PORT`
: set the TCP port to listen on (default: 5000) : listen on this TCP port (default: 5000)
`--base-url=URL` `--base-url=URL`
: set the base url (default: http://localhost:PORT). You would change : set the base url (default: http://IPADDR:PORT). You would change
this when sharing over the network, or integrating within a this when sharing over the network, or integrating within a
larger website. larger website.
@ -2733,7 +2735,7 @@ Does not work well on small screens.
## hledger-api ## hledger-api
This doc is for version **1.1**. <span class="docversions"></span> This doc is for version **dev**. <span class="docversions"></span>
### NAME ### NAME
@ -2840,7 +2842,7 @@ awkward.
## journal format ## journal format
This doc is for version **1.1**. <span class="docversions"></span> This doc is for version **dev**. <span class="docversions"></span>
### NAME ### NAME
@ -3674,7 +3676,7 @@ https://twitter.com/LedgerTips/status/501767602067472384
## csv format ## csv format
This doc is for version **1.1**. <span class="docversions"></span> This doc is for version **dev**. <span class="docversions"></span>
### NAME ### NAME
@ -3857,7 +3859,7 @@ of same-day entries will be preserved, usually.
## timeclock format ## timeclock format
This doc is for version **1.1**. <span class="docversions"></span> This doc is for version **dev**. <span class="docversions"></span>
### NAME ### NAME
@ -3933,7 +3935,7 @@ To generate time logs, ie to clock in and clock out, you could:
## timedot format ## timedot format
This doc is for version **1.1**. <span class="docversions"></span> This doc is for version **dev**. <span class="docversions"></span>
### NAME ### NAME

2
site/doc/1.1/timeclock.md
View File

@ -1,6 +1,6 @@
# timeclock format # timeclock format
This doc is for version **1.1**. <span class="docversions"></span> This doc is for version **dev**. <span class="docversions"></span>
- toc - toc

2
site/doc/1.1/timedot.md
View File

@ -1,6 +1,6 @@
# timedot format # timedot format
This doc is for version **1.1**. <span class="docversions"></span> This doc is for version **dev**. <span class="docversions"></span>
- toc - toc

4115
site/manual-all.md Normal file
View File

File diff suppressed because it is too large Load Diff

28
site/release-notes.md
View File

@ -61,7 +61,7 @@ change logs.
<!-- ([announcement](https://groups.google.com/d/topic/hledger/WgdTy3-a6sc/discussion)) --> <!-- ([announcement](https://groups.google.com/d/topic/hledger/WgdTy3-a6sc/discussion)) -->
Release contributors: Release contributors:
Simon Michael, Johannes Gerer, Nikolay Orlyuk, Shubham Lagwankar. <!-- Justin Le --> Simon Michael, Johannes Gerer, Nikolay Orlyuk, Shubham Lagwankar.
[project-wide](#project-wide-changes) [project-wide](#project-wide-changes)
| [hledger-lib](#hledger-lib-1.1) | [hledger-lib](#hledger-lib-1.1)
@ -76,7 +76,7 @@ Simon Michael, Johannes Gerer, Nikolay Orlyuk, Shubham Lagwankar. <!-- Justin Le
- don't show stack trace details in errors - don't show stack trace details in errors
- more predictable file format detection - more predictable [file format detection](/hledger.html#input-files)
When we don't recognise a file's extension, instead of choosing a subset of When we don't recognise a file's extension, instead of choosing a subset of
readers to try based on content sniffing, now we just try them all. readers to try based on content sniffing, now we just try them all.
@ -86,13 +86,13 @@ Simon Michael, Johannes Gerer, Nikolay Orlyuk, Shubham Lagwankar. <!-- Justin Le
- avoid creating junk CSV rules files when trying alternate readers. - avoid creating junk CSV rules files when trying alternate readers.
We now create it only after successfully reading a file as CSV. We now create it only after successfully reading a file as CSV.
- improvements to -B and -V docs: clearer descriptions, more linkage (#403) - improvements to [-B](/journal.html#transaction-prices) and [-V](/hledger.html#market-value) docs: clearer descriptions, more linkage ([#403](http://bugs.hledger.org/403))
### hledger-lib 1.1 ### hledger-lib 1.1
#### journal format #### journal format
- balance assignments are now supported (#438, #129, #157, #288) - [balance assignments](/journal.html#balance-assignments) are now supported ([#438](http://bugs.hledger.org/438), [#129](http://bugs.hledger.org/129), [#157](http://bugs.hledger.org/157), [#288](http://bugs.hledger.org/288))
This feature also brings a slight performance drop (~5%); This feature also brings a slight performance drop (~5%);
optimisations welcome. optimisations welcome.
@ -122,33 +122,33 @@ Simon Michael, Johannes Gerer, Nikolay Orlyuk, Shubham Lagwankar. <!-- Justin Le
- rename dbgIO to dbg0IO, consistent with dbg0, and document a bug in dbg*IO - rename dbgIO to dbg0IO, consistent with dbg0, and document a bug in dbg*IO
- make readJournalFiles [f] equivalent to readJournalFile f (#437) - make readJournalFiles [f] equivalent to readJournalFile f ([#437](http://bugs.hledger.org/437))
- more general parser types enabling reuse outside of IO (#439) - more general parser types enabling reuse outside of IO ([#439](http://bugs.hledger.org/439))
### hledger 1.1 ### hledger 1.1
#### balance #### balance
- with -V, don't ignore market prices in the future (#453, #403) - with -V, don't ignore market prices in the future ([#453](http://bugs.hledger.org/453), [#403](http://bugs.hledger.org/403))
- with -V and multiple same-date market prices, use the last parsed not the highest price (#403) - with -V and multiple same-date market prices, use the last parsed not the highest price ([#403](http://bugs.hledger.org/403))
#### misc #### misc
- fix non-existent "oldtime" dependency (#431) - fix non-existent "oldtime" dependency ([#431](http://bugs.hledger.org/431))
- extra/hledger-equity.hs now generates valid journal format when there are multiple commodities - [hledger-equity.hs](https://github.com/simonmichael/hledger/blob/master/extra/hledger-equity.hs) now generates valid journal format when there are multiple commodities
### hledger-ui 1.1 ### hledger-ui 1.1
- with --watch, the display updates automatically to show file or date changes - with [--watch](/hledger-ui.html#options), the display updates automatically to show file or date changes
hledger-ui --watch will reload data when the journal file (or any included file) changes. hledger-ui --watch will reload data when the journal file (or any included file) changes.
Also, when viewing a current standard period (ie this day/week/month/quarter/year), Also, when viewing a current standard period (ie this day/week/month/quarter/year),
the period will move as needed to track the current system date. the period will move as needed to track the current system date.
- the --change flag shows period changes at startup instead of historical ending balances - the [--change](/hledger-ui.html#options) flag shows period changes at startup instead of historical ending balances
- the A key runs the hledger-iadd tool, if installed - the A key runs the hledger-iadd tool, if installed
@ -163,7 +163,7 @@ Simon Michael, Johannes Gerer, Nikolay Orlyuk, Shubham Lagwankar. <!-- Justin Le
### hledger-web 1.1 ### hledger-web 1.1
- add --host option (#429) - add [--host](/hledger-web.html#options) option ([#429](http://bugs.hledger.org/429))
This came up in the context of Docker, but it seems it wasn't This came up in the context of Docker, but it seems it wasn't
possible for hledger-web to serve remote clients directly (without possible for hledger-web to serve remote clients directly (without
@ -179,7 +179,7 @@ Simon Michael, Johannes Gerer, Nikolay Orlyuk, Shubham Lagwankar. <!-- Justin Le
### hledger-api 1.1 ### hledger-api 1.1
- serves on 127.0.0.1 by default, --host option added (#432) - serves on 127.0.0.1 by default, [--host](/hledger-api.html#options) option added ([#432](http://bugs.hledger.org/432))
Consistent with hledger-web: serves only local requests by default, Consistent with hledger-web: serves only local requests by default,
use --host=IPADDR to change this. use --host=IPADDR to change this.