Skip to content

Commit 5a3b032

Browse files
Updated README.rst
1 parent b430e86 commit 5a3b032

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

README.rst

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,9 @@ class:
158158
+---------------+---------+---------------------+---------------------------+
159159
| CURRENCY * | 12 | Currency name | [Unused] |
160160
+---------------+---------+---------------------+---------------------------+
161-
| AMOUNT | 13 | Amount | €2.345,67 |
161+
| AMOUNT | 13 | Amount | | €2.345,67 |
162+
| | | | | 750 þús.kr. |
163+
| | | | | 2,7 mrð. USD |
162164
+---------------+---------+---------------------+---------------------------+
163165
| PERSON * | 14 | Person name | [Unused] |
164166
+---------------+---------+---------------------+---------------------------+
@@ -238,8 +240,9 @@ The ``val`` field contains auxiliary information, corresponding to the token kin
238240
The original ordinal may be a decimal number or a Roman numeral.
239241
- For ``TOK.TIMESTAMP``, the ``val`` field contains a ``(year, month, day, hour, minute, second)`` tuple.
240242
- For ``TOK.AMOUNT``, the ``val`` field contains an ``(amount, currency, None, None)`` tuple. The
241-
amount is a float, and the currency is an ISO currency code, i.e. *USD* for dollars ($ sign) or
242-
*EUR* for euros (€ sign). (The two empty fields are included for compatibility with Greynir.)
243+
amount is a float, and the currency is an ISO currency code, e.g. *USD* for dollars ($ sign),
244+
*EUR* for euros (€ sign) or *ISK* for Icelandic króna (*kr.* abbreviation).
245+
(The two empty fields are included for compatibility with Greynir.)
243246
- For ``TOK.MEASUREMENT``, the ``val`` field contains a ``(unit, value)`` tuple, where ``unit``
244247
is a base SI unit (such as ``g``, ``m``, ````, ``s``, ``W``, ``Hz``, ``K`` for temperature
245248
in Kelvin).
@@ -286,4 +289,5 @@ Changelog
286289
---------
287290

288291
* Version 1.0.4: Added ``TOK.DATEABS``, ``TOK.TIMESTAMPABS``, ``TOK.MEASUREMENT``
292+
* Version 1.0.5: Date/time and amount tokens coalesced to a further extent
289293

0 commit comments

Comments
 (0)