money 3.7.0 → 3.7.1
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG.md +7 -0
- data/lib/money.rbc +4 -2
- data/lib/money/bank/base.rbc +20 -2
- data/lib/money/bank/variable_exchange.rbc +38 -2
- data/lib/money/core_extensions.rbc +18 -2
- data/lib/money/currency.rbc +36 -2
- data/lib/money/money.rbc +411 -208
- data/lib/money/money/arithmetic.rbc +38 -2
- data/lib/money/money/formatting.rbc +265 -163
- data/lib/money/money/parsing.rbc +26 -2
- data/money.gemspec +2 -1
- data/spec/bank/base_spec.rbc +54 -2
- data/spec/bank/variable_exchange_spec.rbc +154 -2
- data/spec/core_extensions_spec.rbc +62 -2
- data/spec/currency_spec.rbc +50 -2
- data/spec/money/arithmetic_spec.rbc +190 -2
- data/spec/money/formatting_spec.rbc +1142 -364
- data/spec/money/parsing_spec.rbc +74 -2
- data/spec/money_spec.rbc +812 -145
- data/spec/spec_helper.rbc +10 -2
- metadata +86 -51
@@ -1,6 +1,6 @@
|
|
1
1
|
!RBIX
|
2
|
-
|
3
|
-
|
2
|
+
3867755307746758099
|
3
|
+
18
|
4
4
|
M
|
5
5
|
1
|
6
6
|
n
|
@@ -47,6 +47,8 @@ I
|
|
47
47
|
0
|
48
48
|
I
|
49
49
|
0
|
50
|
+
I
|
51
|
+
0
|
50
52
|
n
|
51
53
|
p
|
52
54
|
5
|
@@ -104,6 +106,8 @@ I
|
|
104
106
|
0
|
105
107
|
I
|
106
108
|
0
|
109
|
+
I
|
110
|
+
0
|
107
111
|
n
|
108
112
|
p
|
109
113
|
5
|
@@ -267,6 +271,8 @@ I
|
|
267
271
|
0
|
268
272
|
I
|
269
273
|
0
|
274
|
+
I
|
275
|
+
0
|
270
276
|
n
|
271
277
|
p
|
272
278
|
21
|
@@ -291,64 +297,88 @@ x
|
|
291
297
|
19
|
292
298
|
thousands_separator
|
293
299
|
i
|
294
|
-
|
295
|
-
|
300
|
+
82
|
301
|
+
5
|
302
|
+
49
|
296
303
|
0
|
304
|
+
0
|
305
|
+
49
|
297
306
|
1
|
298
|
-
|
307
|
+
0
|
308
|
+
9
|
309
|
+
68
|
310
|
+
45
|
299
311
|
2
|
312
|
+
3
|
313
|
+
7
|
314
|
+
4
|
300
315
|
44
|
301
316
|
43
|
302
|
-
|
317
|
+
5
|
303
318
|
79
|
304
319
|
49
|
305
|
-
|
320
|
+
6
|
306
321
|
1
|
307
322
|
13
|
308
323
|
7
|
309
|
-
5
|
310
|
-
45
|
311
|
-
0
|
312
|
-
6
|
313
324
|
7
|
325
|
+
45
|
326
|
+
2
|
327
|
+
8
|
314
328
|
7
|
329
|
+
9
|
315
330
|
44
|
316
331
|
43
|
317
|
-
|
332
|
+
5
|
318
333
|
79
|
319
334
|
49
|
320
|
-
|
335
|
+
6
|
321
336
|
1
|
322
337
|
13
|
323
338
|
7
|
324
|
-
|
339
|
+
7
|
325
340
|
5
|
326
341
|
48
|
327
|
-
|
342
|
+
10
|
328
343
|
49
|
329
|
-
|
344
|
+
11
|
330
345
|
0
|
331
346
|
13
|
332
347
|
10
|
333
|
-
|
348
|
+
52
|
334
349
|
15
|
335
350
|
7
|
336
|
-
|
351
|
+
12
|
337
352
|
64
|
338
353
|
49
|
339
|
-
|
354
|
+
13
|
340
355
|
2
|
341
356
|
15
|
342
357
|
49
|
343
|
-
|
358
|
+
14
|
344
359
|
2
|
345
360
|
49
|
346
|
-
|
361
|
+
13
|
347
362
|
2
|
348
363
|
15
|
349
364
|
49
|
350
|
-
|
365
|
+
14
|
351
366
|
2
|
367
|
+
8
|
368
|
+
81
|
369
|
+
5
|
370
|
+
48
|
371
|
+
10
|
372
|
+
49
|
373
|
+
11
|
374
|
+
0
|
375
|
+
13
|
376
|
+
10
|
377
|
+
81
|
378
|
+
15
|
379
|
+
7
|
380
|
+
12
|
381
|
+
64
|
352
382
|
11
|
353
383
|
I
|
354
384
|
c
|
@@ -358,9 +388,17 @@ I
|
|
358
388
|
0
|
359
389
|
I
|
360
390
|
0
|
391
|
+
I
|
392
|
+
0
|
361
393
|
n
|
362
394
|
p
|
363
|
-
|
395
|
+
15
|
396
|
+
x
|
397
|
+
5
|
398
|
+
class
|
399
|
+
x
|
400
|
+
8
|
401
|
+
use_i18n
|
364
402
|
x
|
365
403
|
4
|
366
404
|
I18n
|
@@ -397,45 +435,57 @@ x
|
|
397
435
|
1
|
398
436
|
t
|
399
437
|
p
|
400
|
-
|
438
|
+
25
|
401
439
|
I
|
402
440
|
-1
|
403
441
|
I
|
404
|
-
|
442
|
+
5
|
405
443
|
I
|
406
444
|
0
|
407
445
|
I
|
408
|
-
|
446
|
+
6
|
409
447
|
I
|
410
|
-
|
448
|
+
9
|
411
449
|
I
|
412
|
-
|
450
|
+
7
|
413
451
|
I
|
414
|
-
|
452
|
+
c
|
415
453
|
I
|
416
|
-
|
454
|
+
8
|
417
455
|
I
|
418
|
-
|
456
|
+
e
|
419
457
|
I
|
420
|
-
|
458
|
+
c
|
421
459
|
I
|
422
|
-
|
460
|
+
16
|
423
461
|
I
|
424
|
-
|
462
|
+
9
|
425
463
|
I
|
426
|
-
|
464
|
+
1b
|
465
|
+
I
|
466
|
+
a
|
467
|
+
I
|
468
|
+
1d
|
469
|
+
I
|
470
|
+
b
|
471
|
+
I
|
472
|
+
38
|
427
473
|
I
|
428
474
|
9
|
429
475
|
I
|
430
|
-
|
476
|
+
3f
|
431
477
|
I
|
432
478
|
7
|
433
479
|
I
|
434
|
-
|
480
|
+
44
|
435
481
|
I
|
436
|
-
|
482
|
+
f
|
437
483
|
I
|
438
|
-
|
484
|
+
51
|
485
|
+
I
|
486
|
+
0
|
487
|
+
I
|
488
|
+
52
|
439
489
|
x
|
440
490
|
64
|
441
491
|
/Users/semmons99/Dropbox/src/money/lib/money/money/formatting.rb
|
@@ -478,6 +528,8 @@ I
|
|
478
528
|
0
|
479
529
|
I
|
480
530
|
0
|
531
|
+
I
|
532
|
+
0
|
481
533
|
n
|
482
534
|
p
|
483
535
|
3
|
@@ -495,11 +547,11 @@ p
|
|
495
547
|
I
|
496
548
|
-1
|
497
549
|
I
|
498
|
-
|
550
|
+
13
|
499
551
|
I
|
500
552
|
0
|
501
553
|
I
|
502
|
-
|
554
|
+
14
|
503
555
|
I
|
504
556
|
e
|
505
557
|
x
|
@@ -525,64 +577,88 @@ x
|
|
525
577
|
12
|
526
578
|
decimal_mark
|
527
579
|
i
|
528
|
-
|
529
|
-
|
580
|
+
82
|
581
|
+
5
|
582
|
+
49
|
583
|
+
0
|
530
584
|
0
|
585
|
+
49
|
531
586
|
1
|
532
|
-
|
587
|
+
0
|
588
|
+
9
|
589
|
+
68
|
590
|
+
45
|
533
591
|
2
|
592
|
+
3
|
593
|
+
7
|
594
|
+
4
|
534
595
|
44
|
535
596
|
43
|
536
|
-
|
597
|
+
5
|
537
598
|
79
|
538
599
|
49
|
539
|
-
|
600
|
+
6
|
540
601
|
1
|
541
602
|
13
|
542
603
|
7
|
543
|
-
5
|
544
|
-
45
|
545
|
-
0
|
546
|
-
6
|
547
604
|
7
|
605
|
+
45
|
606
|
+
2
|
607
|
+
8
|
548
608
|
7
|
609
|
+
9
|
549
610
|
44
|
550
611
|
43
|
551
|
-
|
612
|
+
5
|
552
613
|
79
|
553
614
|
49
|
554
|
-
|
615
|
+
6
|
555
616
|
1
|
556
617
|
13
|
557
618
|
7
|
558
|
-
|
619
|
+
7
|
559
620
|
5
|
560
621
|
48
|
561
|
-
|
622
|
+
10
|
562
623
|
49
|
563
|
-
|
624
|
+
11
|
564
625
|
0
|
565
626
|
13
|
566
627
|
10
|
567
|
-
|
628
|
+
52
|
568
629
|
15
|
569
630
|
7
|
570
|
-
|
631
|
+
12
|
571
632
|
64
|
572
633
|
49
|
573
|
-
|
634
|
+
13
|
574
635
|
2
|
575
636
|
15
|
576
637
|
49
|
577
|
-
|
638
|
+
14
|
578
639
|
2
|
579
640
|
49
|
580
|
-
|
641
|
+
13
|
581
642
|
2
|
582
643
|
15
|
583
644
|
49
|
584
|
-
|
645
|
+
14
|
585
646
|
2
|
647
|
+
8
|
648
|
+
81
|
649
|
+
5
|
650
|
+
48
|
651
|
+
10
|
652
|
+
49
|
653
|
+
11
|
654
|
+
0
|
655
|
+
13
|
656
|
+
10
|
657
|
+
81
|
658
|
+
15
|
659
|
+
7
|
660
|
+
12
|
661
|
+
64
|
586
662
|
11
|
587
663
|
I
|
588
664
|
c
|
@@ -592,9 +668,17 @@ I
|
|
592
668
|
0
|
593
669
|
I
|
594
670
|
0
|
671
|
+
I
|
672
|
+
0
|
595
673
|
n
|
596
674
|
p
|
597
|
-
|
675
|
+
15
|
676
|
+
x
|
677
|
+
5
|
678
|
+
class
|
679
|
+
x
|
680
|
+
8
|
681
|
+
use_i18n
|
598
682
|
x
|
599
683
|
4
|
600
684
|
I18n
|
@@ -631,45 +715,57 @@ x
|
|
631
715
|
1
|
632
716
|
t
|
633
717
|
p
|
634
|
-
|
718
|
+
25
|
635
719
|
I
|
636
720
|
-1
|
637
721
|
I
|
638
|
-
|
722
|
+
1b
|
639
723
|
I
|
640
724
|
0
|
641
725
|
I
|
642
|
-
|
726
|
+
1c
|
643
727
|
I
|
644
|
-
|
728
|
+
9
|
645
729
|
I
|
646
|
-
|
730
|
+
1d
|
647
731
|
I
|
648
|
-
|
732
|
+
c
|
733
|
+
I
|
734
|
+
1e
|
735
|
+
I
|
736
|
+
e
|
737
|
+
I
|
738
|
+
22
|
739
|
+
I
|
740
|
+
16
|
741
|
+
I
|
742
|
+
1f
|
649
743
|
I
|
650
744
|
1b
|
651
745
|
I
|
652
|
-
|
746
|
+
20
|
653
747
|
I
|
654
|
-
|
748
|
+
1d
|
655
749
|
I
|
656
|
-
|
750
|
+
21
|
657
751
|
I
|
658
|
-
|
752
|
+
38
|
659
753
|
I
|
660
|
-
|
754
|
+
1f
|
661
755
|
I
|
662
|
-
|
756
|
+
3f
|
663
757
|
I
|
664
|
-
|
758
|
+
1d
|
665
759
|
I
|
666
|
-
|
760
|
+
44
|
667
761
|
I
|
668
|
-
|
762
|
+
25
|
669
763
|
I
|
670
|
-
|
764
|
+
51
|
671
765
|
I
|
672
|
-
|
766
|
+
0
|
767
|
+
I
|
768
|
+
52
|
673
769
|
x
|
674
770
|
64
|
675
771
|
/Users/semmons99/Dropbox/src/money/lib/money/money/formatting.rb
|
@@ -706,6 +802,8 @@ I
|
|
706
802
|
0
|
707
803
|
I
|
708
804
|
0
|
805
|
+
I
|
806
|
+
0
|
709
807
|
n
|
710
808
|
p
|
711
809
|
3
|
@@ -723,11 +821,11 @@ p
|
|
723
821
|
I
|
724
822
|
-1
|
725
823
|
I
|
726
|
-
|
824
|
+
29
|
727
825
|
I
|
728
826
|
0
|
729
827
|
I
|
730
|
-
|
828
|
+
2a
|
731
829
|
I
|
732
830
|
e
|
733
831
|
x
|
@@ -1324,6 +1422,8 @@ I
|
|
1324
1422
|
0
|
1325
1423
|
I
|
1326
1424
|
0
|
1425
|
+
I
|
1426
|
+
0
|
1327
1427
|
p
|
1328
1428
|
41
|
1329
1429
|
x
|
@@ -1452,35 +1552,35 @@ p
|
|
1452
1552
|
I
|
1453
1553
|
-1
|
1454
1554
|
I
|
1455
|
-
|
1555
|
+
8e
|
1456
1556
|
I
|
1457
1557
|
0
|
1458
1558
|
I
|
1459
|
-
|
1559
|
+
90
|
1460
1560
|
I
|
1461
1561
|
a
|
1462
1562
|
I
|
1463
|
-
|
1563
|
+
92
|
1464
1564
|
I
|
1465
1565
|
12
|
1466
1566
|
I
|
1467
|
-
|
1567
|
+
93
|
1468
1568
|
I
|
1469
1569
|
20
|
1470
1570
|
I
|
1471
|
-
|
1571
|
+
94
|
1472
1572
|
I
|
1473
1573
|
2a
|
1474
1574
|
I
|
1475
|
-
|
1575
|
+
95
|
1476
1576
|
I
|
1477
1577
|
33
|
1478
1578
|
I
|
1479
|
-
|
1579
|
+
96
|
1480
1580
|
I
|
1481
1581
|
39
|
1482
1582
|
I
|
1483
|
-
|
1583
|
+
95
|
1484
1584
|
I
|
1485
1585
|
3a
|
1486
1586
|
I
|
@@ -1488,7 +1588,7 @@ I
|
|
1488
1588
|
I
|
1489
1589
|
3c
|
1490
1590
|
I
|
1491
|
-
|
1591
|
+
92
|
1492
1592
|
I
|
1493
1593
|
3d
|
1494
1594
|
I
|
@@ -1496,27 +1596,27 @@ I
|
|
1496
1596
|
I
|
1497
1597
|
3e
|
1498
1598
|
I
|
1499
|
-
|
1599
|
+
9b
|
1500
1600
|
I
|
1501
1601
|
47
|
1502
1602
|
I
|
1503
|
-
|
1603
|
+
9c
|
1504
1604
|
I
|
1505
1605
|
53
|
1506
1606
|
I
|
1507
|
-
|
1607
|
+
9d
|
1508
1608
|
I
|
1509
1609
|
58
|
1510
1610
|
I
|
1511
|
-
|
1611
|
+
9e
|
1512
1612
|
I
|
1513
1613
|
61
|
1514
1614
|
I
|
1515
|
-
|
1615
|
+
9f
|
1516
1616
|
I
|
1517
1617
|
6a
|
1518
1618
|
I
|
1519
|
-
|
1619
|
+
a1
|
1520
1620
|
I
|
1521
1621
|
6d
|
1522
1622
|
I
|
@@ -1524,51 +1624,51 @@ I
|
|
1524
1624
|
I
|
1525
1625
|
6f
|
1526
1626
|
I
|
1527
|
-
|
1627
|
+
a3
|
1528
1628
|
I
|
1529
1629
|
78
|
1530
1630
|
I
|
1531
|
-
|
1631
|
+
a4
|
1532
1632
|
I
|
1533
1633
|
80
|
1534
1634
|
I
|
1535
|
-
|
1635
|
+
a6
|
1536
1636
|
I
|
1537
1637
|
83
|
1538
1638
|
I
|
1539
|
-
|
1639
|
+
9a
|
1540
1640
|
I
|
1541
1641
|
86
|
1542
1642
|
I
|
1543
|
-
|
1643
|
+
a9
|
1544
1644
|
I
|
1545
1645
|
8d
|
1546
1646
|
I
|
1547
|
-
|
1647
|
+
aa
|
1548
1648
|
I
|
1549
1649
|
96
|
1550
1650
|
I
|
1551
|
-
|
1651
|
+
ab
|
1552
1652
|
I
|
1553
1653
|
a5
|
1554
1654
|
I
|
1555
|
-
|
1655
|
+
ad
|
1556
1656
|
I
|
1557
1657
|
ae
|
1558
1658
|
I
|
1559
|
-
|
1659
|
+
a9
|
1560
1660
|
I
|
1561
1661
|
b1
|
1562
1662
|
I
|
1563
|
-
|
1663
|
+
b0
|
1564
1664
|
I
|
1565
1665
|
cd
|
1566
1666
|
I
|
1567
|
-
|
1667
|
+
b1
|
1568
1668
|
I
|
1569
1669
|
dd
|
1570
1670
|
I
|
1571
|
-
|
1671
|
+
b0
|
1572
1672
|
I
|
1573
1673
|
de
|
1574
1674
|
I
|
@@ -1576,43 +1676,43 @@ I
|
|
1576
1676
|
I
|
1577
1677
|
df
|
1578
1678
|
I
|
1579
|
-
|
1679
|
+
b5
|
1580
1680
|
I
|
1581
1681
|
e8
|
1582
1682
|
I
|
1583
|
-
|
1683
|
+
b6
|
1584
1684
|
I
|
1585
1685
|
f1
|
1586
1686
|
I
|
1587
|
-
|
1687
|
+
b7
|
1588
1688
|
I
|
1589
1689
|
f9
|
1590
1690
|
I
|
1591
|
-
|
1691
|
+
b8
|
1592
1692
|
I
|
1593
1693
|
fd
|
1594
1694
|
I
|
1595
|
-
|
1695
|
+
ba
|
1596
1696
|
I
|
1597
1697
|
ff
|
1598
1698
|
I
|
1599
|
-
|
1699
|
+
b4
|
1600
1700
|
I
|
1601
1701
|
102
|
1602
1702
|
I
|
1603
|
-
|
1703
|
+
bd
|
1604
1704
|
I
|
1605
1705
|
115
|
1606
1706
|
I
|
1607
|
-
|
1707
|
+
be
|
1608
1708
|
I
|
1609
1709
|
139
|
1610
1710
|
I
|
1611
|
-
|
1711
|
+
be
|
1612
1712
|
I
|
1613
1713
|
13d
|
1614
1714
|
I
|
1615
|
-
|
1715
|
+
bd
|
1616
1716
|
I
|
1617
1717
|
13e
|
1618
1718
|
I
|
@@ -1620,19 +1720,19 @@ I
|
|
1620
1720
|
I
|
1621
1721
|
13f
|
1622
1722
|
I
|
1623
|
-
|
1723
|
+
c1
|
1624
1724
|
I
|
1625
1725
|
155
|
1626
1726
|
I
|
1627
|
-
|
1727
|
+
c2
|
1628
1728
|
I
|
1629
1729
|
169
|
1630
1730
|
I
|
1631
|
-
|
1731
|
+
c3
|
1632
1732
|
I
|
1633
1733
|
17a
|
1634
1734
|
I
|
1635
|
-
|
1735
|
+
c1
|
1636
1736
|
I
|
1637
1737
|
17b
|
1638
1738
|
I
|
@@ -1640,31 +1740,31 @@ I
|
|
1640
1740
|
I
|
1641
1741
|
17c
|
1642
1742
|
I
|
1643
|
-
|
1743
|
+
c6
|
1644
1744
|
I
|
1645
1745
|
182
|
1646
1746
|
I
|
1647
|
-
|
1747
|
+
c8
|
1648
1748
|
I
|
1649
1749
|
18b
|
1650
1750
|
I
|
1651
|
-
|
1751
|
+
c9
|
1652
1752
|
I
|
1653
1753
|
1a5
|
1654
1754
|
I
|
1655
|
-
|
1755
|
+
ca
|
1656
1756
|
I
|
1657
1757
|
1ac
|
1658
1758
|
I
|
1659
|
-
|
1759
|
+
cb
|
1660
1760
|
I
|
1661
1761
|
1b5
|
1662
1762
|
I
|
1663
|
-
|
1763
|
+
cc
|
1664
1764
|
I
|
1665
1765
|
1c0
|
1666
1766
|
I
|
1667
|
-
|
1767
|
+
cb
|
1668
1768
|
I
|
1669
1769
|
1c1
|
1670
1770
|
I
|
@@ -1672,7 +1772,7 @@ I
|
|
1672
1772
|
I
|
1673
1773
|
1c3
|
1674
1774
|
I
|
1675
|
-
|
1775
|
+
c8
|
1676
1776
|
I
|
1677
1777
|
1c4
|
1678
1778
|
I
|
@@ -1680,19 +1780,19 @@ I
|
|
1680
1780
|
I
|
1681
1781
|
1c5
|
1682
1782
|
I
|
1683
|
-
|
1783
|
+
d1
|
1684
1784
|
I
|
1685
1785
|
1e6
|
1686
1786
|
I
|
1687
|
-
|
1787
|
+
d3
|
1688
1788
|
I
|
1689
1789
|
1ef
|
1690
1790
|
I
|
1691
|
-
|
1791
|
+
d4
|
1692
1792
|
I
|
1693
1793
|
1f8
|
1694
1794
|
I
|
1695
|
-
|
1795
|
+
d5
|
1696
1796
|
I
|
1697
1797
|
20c
|
1698
1798
|
I
|
@@ -1700,11 +1800,11 @@ I
|
|
1700
1800
|
I
|
1701
1801
|
20d
|
1702
1802
|
I
|
1703
|
-
|
1803
|
+
d6
|
1704
1804
|
I
|
1705
1805
|
219
|
1706
1806
|
I
|
1707
|
-
|
1807
|
+
d7
|
1708
1808
|
I
|
1709
1809
|
22d
|
1710
1810
|
I
|
@@ -1712,7 +1812,7 @@ I
|
|
1712
1812
|
I
|
1713
1813
|
22f
|
1714
1814
|
I
|
1715
|
-
|
1815
|
+
d3
|
1716
1816
|
I
|
1717
1817
|
230
|
1718
1818
|
I
|
@@ -1720,7 +1820,7 @@ I
|
|
1720
1820
|
I
|
1721
1821
|
231
|
1722
1822
|
I
|
1723
|
-
|
1823
|
+
d9
|
1724
1824
|
I
|
1725
1825
|
234
|
1726
1826
|
x
|
@@ -1937,6 +2037,8 @@ I
|
|
1937
2037
|
I
|
1938
2038
|
1
|
1939
2039
|
I
|
2040
|
+
0
|
2041
|
+
I
|
1940
2042
|
1
|
1941
2043
|
n
|
1942
2044
|
p
|
@@ -1989,27 +2091,27 @@ p
|
|
1989
2091
|
I
|
1990
2092
|
-1
|
1991
2093
|
I
|
1992
|
-
|
2094
|
+
e4
|
1993
2095
|
I
|
1994
2096
|
0
|
1995
2097
|
I
|
1996
|
-
|
2098
|
+
e5
|
1997
2099
|
I
|
1998
2100
|
a
|
1999
2101
|
I
|
2000
|
-
|
2102
|
+
e6
|
2001
2103
|
I
|
2002
2104
|
15
|
2003
2105
|
I
|
2004
|
-
|
2106
|
+
e7
|
2005
2107
|
I
|
2006
2108
|
1f
|
2007
2109
|
I
|
2008
|
-
|
2110
|
+
e8
|
2009
2111
|
I
|
2010
2112
|
27
|
2011
2113
|
I
|
2012
|
-
|
2114
|
+
e9
|
2013
2115
|
I
|
2014
2116
|
45
|
2015
2117
|
I
|
@@ -2017,7 +2119,7 @@ I
|
|
2017
2119
|
I
|
2018
2120
|
47
|
2019
2121
|
I
|
2020
|
-
|
2122
|
+
e7
|
2021
2123
|
I
|
2022
2124
|
48
|
2023
2125
|
I
|
@@ -2025,15 +2127,15 @@ I
|
|
2025
2127
|
I
|
2026
2128
|
49
|
2027
2129
|
I
|
2028
|
-
|
2130
|
+
eb
|
2029
2131
|
I
|
2030
2132
|
63
|
2031
2133
|
I
|
2032
|
-
|
2134
|
+
ec
|
2033
2135
|
I
|
2034
2136
|
77
|
2035
2137
|
I
|
2036
|
-
|
2138
|
+
eb
|
2037
2139
|
I
|
2038
2140
|
78
|
2039
2141
|
I
|
@@ -2041,15 +2143,15 @@ I
|
|
2041
2143
|
I
|
2042
2144
|
79
|
2043
2145
|
I
|
2044
|
-
|
2146
|
+
ee
|
2045
2147
|
I
|
2046
2148
|
93
|
2047
2149
|
I
|
2048
|
-
|
2150
|
+
ef
|
2049
2151
|
I
|
2050
2152
|
a7
|
2051
2153
|
I
|
2052
|
-
|
2154
|
+
ee
|
2053
2155
|
I
|
2054
2156
|
a8
|
2055
2157
|
I
|
@@ -2057,7 +2159,7 @@ I
|
|
2057
2159
|
I
|
2058
2160
|
a9
|
2059
2161
|
I
|
2060
|
-
|
2162
|
+
f1
|
2061
2163
|
I
|
2062
2164
|
ac
|
2063
2165
|
x
|
@@ -2073,15 +2175,15 @@ p
|
|
2073
2175
|
I
|
2074
2176
|
2
|
2075
2177
|
I
|
2076
|
-
|
2178
|
+
4
|
2077
2179
|
I
|
2078
2180
|
d
|
2079
2181
|
I
|
2080
|
-
|
2182
|
+
5
|
2081
2183
|
I
|
2082
2184
|
1c
|
2083
2185
|
I
|
2084
|
-
|
2186
|
+
13
|
2085
2187
|
I
|
2086
2188
|
29
|
2087
2189
|
I
|
@@ -2089,19 +2191,19 @@ I
|
|
2089
2191
|
I
|
2090
2192
|
2a
|
2091
2193
|
I
|
2092
|
-
|
2194
|
+
17
|
2093
2195
|
I
|
2094
2196
|
34
|
2095
2197
|
I
|
2096
|
-
|
2198
|
+
1a
|
2097
2199
|
I
|
2098
2200
|
3f
|
2099
2201
|
I
|
2100
|
-
|
2202
|
+
1b
|
2101
2203
|
I
|
2102
2204
|
4e
|
2103
2205
|
I
|
2104
|
-
|
2206
|
+
29
|
2105
2207
|
I
|
2106
2208
|
5b
|
2107
2209
|
I
|
@@ -2109,19 +2211,19 @@ I
|
|
2109
2211
|
I
|
2110
2212
|
5c
|
2111
2213
|
I
|
2112
|
-
|
2214
|
+
2d
|
2113
2215
|
I
|
2114
2216
|
66
|
2115
2217
|
I
|
2116
|
-
|
2218
|
+
8e
|
2117
2219
|
I
|
2118
2220
|
74
|
2119
2221
|
I
|
2120
|
-
|
2222
|
+
dd
|
2121
2223
|
I
|
2122
2224
|
78
|
2123
2225
|
I
|
2124
|
-
|
2226
|
+
e4
|
2125
2227
|
I
|
2126
2228
|
86
|
2127
2229
|
x
|