@@ -158,7 +158,9 @@ class:
158
158
+---------------+---------+---------------------+---------------------------+
159
159
| CURRENCY * | 12 | Currency name | [Unused] |
160
160
+---------------+---------+---------------------+---------------------------+
161
- | AMOUNT | 13 | Amount | €2.345,67 |
161
+ | AMOUNT | 13 | Amount | | €2.345,67 |
162
+ | | | | | 750 þús.kr. |
163
+ | | | | | 2,7 mrð. USD |
162
164
+---------------+---------+---------------------+---------------------------+
163
165
| PERSON * | 14 | Person name | [Unused] |
164
166
+---------------+---------+---------------------+---------------------------+
@@ -238,8 +240,9 @@ The ``val`` field contains auxiliary information, corresponding to the token kin
238
240
The original ordinal may be a decimal number or a Roman numeral.
239
241
- For ``TOK.TIMESTAMP ``, the ``val `` field contains a ``(year, month, day, hour, minute, second) `` tuple.
240
242
- 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.)
243
246
- For ``TOK.MEASUREMENT ``, the ``val `` field contains a ``(unit, value) `` tuple, where ``unit ``
244
247
is a base SI unit (such as ``g ``, ``m ``, ``m² ``, ``s ``, ``W ``, ``Hz ``, ``K `` for temperature
245
248
in Kelvin).
@@ -286,4 +289,5 @@ Changelog
286
289
---------
287
290
288
291
* 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
289
293
0 commit comments