diff --git a/hledger-lib/hledger_journal.5 b/hledger-lib/hledger_journal.5 index be7b1e830..caf64819d 100644 --- a/hledger-lib/hledger_journal.5 +++ b/hledger-lib/hledger_journal.5 @@ -372,14 +372,11 @@ Some examples: .PD 0 .P .PD -\f[C]EUR\ 1E3\ \ \ #\ 1000\ euros\f[] -.PD 0 -.P -.PD -\f[C]1000E\-6s\ \ #\ 1000\ microseconds\f[] +\f[C]EUR\ 1E3\f[] .PD 0 .P .PD +\f[C]1000E\-6s\f[] .PP As you can see, the amount format is somewhat flexible: .IP \[bu] 2 diff --git a/hledger-lib/hledger_journal.info b/hledger-lib/hledger_journal.info index 1311c5109..e81407e78 100644 --- a/hledger-lib/hledger_journal.info +++ b/hledger-lib/hledger_journal.info @@ -349,8 +349,8 @@ commodity name. Some examples: 'INR 9,99,99,999.00' 'EUR -2.000.000,00' '1 999 999.9455' -'EUR 1E3 # 1000 euros' -'1000E-6s # 1000 microseconds' +'EUR 1E3' +'1000E-6s' As you can see, the amount format is somewhat flexible: @@ -1206,65 +1206,65 @@ Node: Account names11239 Ref: #account-names11382 Node: Amounts11869 Ref: #amounts12005 -Node: Virtual Postings15053 -Ref: #virtual-postings15212 -Node: Balance Assertions16432 -Ref: #balance-assertions16607 -Node: Assertions and ordering17503 -Ref: #assertions-and-ordering17689 -Node: Assertions and included files18389 -Ref: #assertions-and-included-files18630 -Node: Assertions and multiple -f options18963 -Ref: #assertions-and-multiple--f-options19217 -Node: Assertions and commodities19349 -Ref: #assertions-and-commodities19584 -Node: Assertions and subaccounts20280 -Ref: #assertions-and-subaccounts20512 -Node: Assertions and virtual postings21033 -Ref: #assertions-and-virtual-postings21240 -Node: Balance Assignments21382 -Ref: #balance-assignments21551 -Node: Prices22671 -Ref: #prices22804 -Node: Transaction prices22855 -Ref: #transaction-prices23000 -Node: Market prices25156 -Ref: #market-prices25291 -Node: Comments26251 -Ref: #comments26373 -Node: Tags27615 -Ref: #tags27733 -Node: Directives29135 -Ref: #directives29248 -Node: Account aliases29441 -Ref: #account-aliases29585 -Node: Basic aliases30189 -Ref: #basic-aliases30332 -Node: Regex aliases31022 -Ref: #regex-aliases31190 -Node: Multiple aliases31908 -Ref: #multiple-aliases32080 -Node: end aliases32578 -Ref: #end-aliases32718 -Node: account directive32819 -Ref: #account-directive32999 -Node: apply account directive34346 -Ref: #apply-account-directive34542 -Node: Multi-line comments35201 -Ref: #multi-line-comments35391 -Node: commodity directive35519 -Ref: #commodity-directive35703 -Node: Default commodity36575 -Ref: #default-commodity36748 -Node: Default year37285 -Ref: #default-year37450 -Node: Including other files37873 -Ref: #including-other-files38030 -Node: Periodic transactions38427 -Ref: #periodic-transactions38593 -Node: Automated postings39582 -Ref: #automated-postings39745 -Node: EDITOR SUPPORT40647 -Ref: #editor-support40772 +Node: Virtual Postings15020 +Ref: #virtual-postings15179 +Node: Balance Assertions16399 +Ref: #balance-assertions16574 +Node: Assertions and ordering17470 +Ref: #assertions-and-ordering17656 +Node: Assertions and included files18356 +Ref: #assertions-and-included-files18597 +Node: Assertions and multiple -f options18930 +Ref: #assertions-and-multiple--f-options19184 +Node: Assertions and commodities19316 +Ref: #assertions-and-commodities19551 +Node: Assertions and subaccounts20247 +Ref: #assertions-and-subaccounts20479 +Node: Assertions and virtual postings21000 +Ref: #assertions-and-virtual-postings21207 +Node: Balance Assignments21349 +Ref: #balance-assignments21518 +Node: Prices22638 +Ref: #prices22771 +Node: Transaction prices22822 +Ref: #transaction-prices22967 +Node: Market prices25123 +Ref: #market-prices25258 +Node: Comments26218 +Ref: #comments26340 +Node: Tags27582 +Ref: #tags27700 +Node: Directives29102 +Ref: #directives29215 +Node: Account aliases29408 +Ref: #account-aliases29552 +Node: Basic aliases30156 +Ref: #basic-aliases30299 +Node: Regex aliases30989 +Ref: #regex-aliases31157 +Node: Multiple aliases31875 +Ref: #multiple-aliases32047 +Node: end aliases32545 +Ref: #end-aliases32685 +Node: account directive32786 +Ref: #account-directive32966 +Node: apply account directive34313 +Ref: #apply-account-directive34509 +Node: Multi-line comments35168 +Ref: #multi-line-comments35358 +Node: commodity directive35486 +Ref: #commodity-directive35670 +Node: Default commodity36542 +Ref: #default-commodity36715 +Node: Default year37252 +Ref: #default-year37417 +Node: Including other files37840 +Ref: #including-other-files37997 +Node: Periodic transactions38394 +Ref: #periodic-transactions38560 +Node: Automated postings39549 +Ref: #automated-postings39712 +Node: EDITOR SUPPORT40614 +Ref: #editor-support40739  End Tag Table diff --git a/hledger-lib/hledger_journal.m4.md b/hledger-lib/hledger_journal.m4.md index 404f8eb0e..e715d55c7 100644 --- a/hledger-lib/hledger_journal.m4.md +++ b/hledger-lib/hledger_journal.m4.md @@ -269,8 +269,8 @@ Amounts consist of a number and (usually) a currency symbol or commodity name. S `INR 9,99,99,999.00`\ `EUR -2.000.000,00`\ `1 999 999.9455`\ - `EUR 1E3 # 1000 euros`\ - `1000E-6s # 1000 microseconds`\ + `EUR 1E3`\ + `1000E-6s` As you can see, the amount format is somewhat flexible: diff --git a/hledger-lib/hledger_journal.txt b/hledger-lib/hledger_journal.txt index c0c1f47a4..fb2f02a5f 100644 --- a/hledger-lib/hledger_journal.txt +++ b/hledger-lib/hledger_journal.txt @@ -261,8 +261,8 @@ FILE FORMAT INR 9,99,99,999.00 EUR -2.000.000,00 1 999 999.9455 - EUR 1E3 # 1000 euros - 1000E-6s # 1000 microseconds + EUR 1E3 + 1000E-6s As you can see, the amount format is somewhat flexible: