bibtex-ruby 1.3.11 → 1.3.12
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of bibtex-ruby might be problematic. Click here for more details.
- data/Gemfile +3 -2
- data/Gemfile.lock +9 -1
- data/History.txt +4 -0
- data/Manifest +2 -2
- data/Rakefile +4 -2
- data/lib/bibtex.rb +6 -5
- data/lib/bibtex/bibtex.y +1 -1
- data/lib/bibtex/entry.rb +44 -19
- data/lib/bibtex/entry.rbc +198 -214
- data/lib/bibtex/lexer.rb +0 -3
- data/lib/bibtex/name_parser.rb +70 -128
- data/lib/bibtex/names.y +60 -44
- data/lib/bibtex/parser.rb +1 -1
- data/lib/bibtex/version.rb +1 -1
- data/lib/bibtex/version.rbc +1 -1
- data/profile.png +0 -0
- data/test/benchmark.rb +8 -8
- data/test/bibtex/test_entry.rb +7 -0
- data/test/profile.dot +191 -0
- data/test/profile.rb +2 -5
- metadata +23 -29
- data/lib/bibtex/name_parser.output +0 -486
- data/lib/bibtex/parser.output +0 -591
data/Gemfile
CHANGED
@@ -2,8 +2,9 @@ source :rubygems
|
|
2
2
|
gemspec
|
3
3
|
|
4
4
|
group :debug do
|
5
|
-
gem 'ruby-debug19', :require => 'ruby-debug', :platforms => [:
|
6
|
-
gem 'ruby-debug', :platforms => [:
|
5
|
+
gem 'ruby-debug19', :require => 'ruby-debug', :platforms => [:mri_19]
|
6
|
+
gem 'ruby-debug', :platforms => [:mri_18]
|
7
|
+
gem 'rbx-trepanning', :platforms => [:rbx]
|
7
8
|
end
|
8
9
|
|
9
10
|
group :profile do
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
bibtex-ruby (1.3.
|
4
|
+
bibtex-ruby (1.3.12)
|
5
5
|
latex-decode (>= 0.0.3)
|
6
6
|
|
7
7
|
GEM
|
@@ -39,7 +39,14 @@ GEM
|
|
39
39
|
term-ansicolor (>= 1.0.4)
|
40
40
|
racc (1.4.6)
|
41
41
|
rake (0.9.2)
|
42
|
+
rbx-linecache (1.3)
|
43
|
+
rbx-require-relative
|
42
44
|
rbx-require-relative (0.0.5)
|
45
|
+
rbx-trepanning (1.8.7)
|
46
|
+
columnize
|
47
|
+
diff-lcs
|
48
|
+
rbx-linecache (~> 1.2)
|
49
|
+
rbx-require-relative (>= 0.0.4)
|
43
50
|
rdoc (3.9.1)
|
44
51
|
ruby-debug (0.10.4)
|
45
52
|
columnize (>= 0.1)
|
@@ -75,6 +82,7 @@ DEPENDENCIES
|
|
75
82
|
mynyml-redgreen (~> 0.7)
|
76
83
|
racc (~> 1.4)
|
77
84
|
rake (~> 0.9)
|
85
|
+
rbx-trepanning
|
78
86
|
rdoc (~> 3.9)
|
79
87
|
ruby-debug
|
80
88
|
ruby-debug19
|
data/History.txt
CHANGED
data/Manifest
CHANGED
@@ -57,13 +57,11 @@ lib/bibtex/filters.rb
|
|
57
57
|
lib/bibtex/filters.rbc
|
58
58
|
lib/bibtex/lexer.rb
|
59
59
|
lib/bibtex/lexer.rbc
|
60
|
-
lib/bibtex/name_parser.output
|
61
60
|
lib/bibtex/name_parser.rb
|
62
61
|
lib/bibtex/name_parser.rbc
|
63
62
|
lib/bibtex/names.rb
|
64
63
|
lib/bibtex/names.rbc
|
65
64
|
lib/bibtex/names.y
|
66
|
-
lib/bibtex/parser.output
|
67
65
|
lib/bibtex/parser.rb
|
68
66
|
lib/bibtex/parser.rbc
|
69
67
|
lib/bibtex/replaceable.rb
|
@@ -77,6 +75,7 @@ lib/bibtex/version.rb
|
|
77
75
|
lib/bibtex/version.rbc
|
78
76
|
lib/bibtex.rb
|
79
77
|
lib/bibtex.rbc
|
78
|
+
profile.png
|
80
79
|
test
|
81
80
|
test/benchmark.rb
|
82
81
|
test/bibtex
|
@@ -114,6 +113,7 @@ test/fixtures/preamble.bib
|
|
114
113
|
test/fixtures/roundtrip.bib
|
115
114
|
test/helper.rb
|
116
115
|
test/helper.rbc
|
116
|
+
test/profile.dot
|
117
117
|
test/profile.rb
|
118
118
|
test/test_bibtex.rb
|
119
119
|
test/test_bibtex.rbc
|
data/Rakefile
CHANGED
@@ -1,4 +1,6 @@
|
|
1
1
|
# -*- ruby -*-
|
2
|
+
lib = File.expand_path('../lib/', __FILE__)
|
3
|
+
$:.unshift lib unless $:.include?(lib)
|
2
4
|
|
3
5
|
require 'rake/clean'
|
4
6
|
require 'rake/testtask'
|
@@ -44,12 +46,12 @@ task :test => ['racc','test_task']
|
|
44
46
|
file 'lib/bibtex/parser.output' => ['lib/bibtex/parser.rb']
|
45
47
|
file 'lib/bibtex/parser.rb' => ['lib/bibtex/bibtex.y'] do
|
46
48
|
# sh 'racc -v -g -o lib/bibtex/parser.rb lib/bibtex/bibtex.y'
|
47
|
-
sh 'bundle exec racc -
|
49
|
+
sh 'bundle exec racc -o lib/bibtex/parser.rb lib/bibtex/bibtex.y'
|
48
50
|
end
|
49
51
|
|
50
52
|
file 'lib/bibtex/name_parser.rb' => ['lib/bibtex/names.y'] do
|
51
53
|
# sh 'racc -v -g -o lib/bibtex/name_parser.rb lib/bibtex/names.y'
|
52
|
-
sh 'bundle exec racc -
|
54
|
+
sh 'bundle exec racc -o lib/bibtex/name_parser.rb lib/bibtex/names.y'
|
53
55
|
end
|
54
56
|
|
55
57
|
desc 'Runs the benchmarks (and plots the results)'
|
data/lib/bibtex.rb
CHANGED
@@ -1,17 +1,17 @@
|
|
1
1
|
#--
|
2
2
|
# BibTeX-Ruby
|
3
3
|
# Copyright (C) 2010-2011 Sylvester Keil <sylvester.keil.or.at>
|
4
|
-
#
|
4
|
+
#
|
5
5
|
# This program is free software: you can redistribute it and/or modify
|
6
6
|
# it under the terms of the GNU General Public License as published by
|
7
7
|
# the Free Software Foundation, either version 3 of the License, or
|
8
8
|
# (at your option) any later version.
|
9
|
-
#
|
9
|
+
#
|
10
10
|
# This program is distributed in the hope that it will be useful,
|
11
11
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
12
12
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
13
13
|
# GNU General Public License for more details.
|
14
|
-
#
|
14
|
+
#
|
15
15
|
# You should have received a copy of the GNU General Public License
|
16
16
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
17
17
|
#++
|
@@ -45,7 +45,8 @@ module BibTeX
|
|
45
45
|
Log.level = ENV.has_key?('DEBUG') ? Logger::DEBUG : Logger::WARN
|
46
46
|
Log.datetime_format = '%Y-%m-%d %H:%M:%S'
|
47
47
|
|
48
|
-
def self.log; BibTeX::Log end
|
48
|
+
def self.log; BibTeX::Log; end
|
49
|
+
|
49
50
|
end
|
50
51
|
|
51
52
|
# Load debugger
|
@@ -64,4 +65,4 @@ require 'bibtex/entry'
|
|
64
65
|
require 'bibtex/error'
|
65
66
|
require 'bibtex/parser'
|
66
67
|
require 'bibtex/bibliography'
|
67
|
-
require 'bibtex/utilities'
|
68
|
+
require 'bibtex/utilities'
|
data/lib/bibtex/bibtex.y
CHANGED
@@ -33,7 +33,7 @@ rule
|
|
33
33
|
bibliography : /* empty */ { result = BibTeX::Bibliography.new(@options) }
|
34
34
|
| objects { result = val[0] }
|
35
35
|
|
36
|
-
objects : object { result = BibTeX::Bibliography.new << val[0] }
|
36
|
+
objects : object { result = BibTeX::Bibliography.new(@options) << val[0] }
|
37
37
|
| objects object { result << val[1] }
|
38
38
|
|
39
39
|
object : AT at_object { result = val[1] }
|
data/lib/bibtex/entry.rb
CHANGED
@@ -102,7 +102,7 @@ module BibTeX
|
|
102
102
|
}.map(&:intern)]).freeze
|
103
103
|
|
104
104
|
|
105
|
-
attr_reader :
|
105
|
+
attr_reader :fields, :type
|
106
106
|
def_delegators :@fields, :empty?, :each, :each_pair
|
107
107
|
|
108
108
|
# Creates a new instance. If a hash is given, the entry is populated accordingly.
|
@@ -142,9 +142,10 @@ module BibTeX
|
|
142
142
|
@key ||= default_key
|
143
143
|
end
|
144
144
|
|
145
|
-
alias id key
|
145
|
+
alias id key
|
146
146
|
alias id= key=
|
147
|
-
|
147
|
+
|
148
|
+
# TODO we should be more lenient: allow strings as key or don't check at all
|
148
149
|
# Sets the type of the entry.
|
149
150
|
def type=(type)
|
150
151
|
raise(ArgumentError, "types must be convertible to Symbol; was: #{type.class.name}.") unless type.respond_to?(:to_sym)
|
@@ -152,20 +153,26 @@ module BibTeX
|
|
152
153
|
end
|
153
154
|
|
154
155
|
def has_type?(type)
|
155
|
-
|
156
|
-
|
156
|
+
type.to_s.match(/^entry$/i) || @type == type.to_sym || super
|
157
|
+
end
|
157
158
|
|
158
159
|
def has_field?(field)
|
159
160
|
@fields.has_key?(field)
|
160
161
|
end
|
161
162
|
|
162
163
|
def method_missing(name, *args, &block)
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
164
|
+
case
|
165
|
+
when @fields.has_key?(name)
|
166
|
+
@fields[name]
|
167
|
+
when name.to_s =~ /^(.+)=$/
|
168
|
+
send(:add, $1.to_sym, args[0])
|
169
|
+
when name =~ /^(?:convert|from)_([a-z]+)(!)?$/
|
170
|
+
$2 ? convert!($1, &block) : convert($1, &block)
|
171
|
+
else
|
172
|
+
super
|
173
|
+
end
|
167
174
|
end
|
168
|
-
|
175
|
+
|
169
176
|
def respond_to?(method)
|
170
177
|
@fields.has_key?(method.to_sym) || method.to_s.match(/=$/) || method =~ /^(?:convert|from)_([a-z]+)(!)?$/ || super
|
171
178
|
end
|
@@ -178,15 +185,15 @@ module BibTeX
|
|
178
185
|
# Renames the given field names unless a field with the new name already
|
179
186
|
# exists.
|
180
187
|
def rename!(*arguments)
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
+
Hash[*arguments.flatten].each_pair do |from,to|
|
189
|
+
if @fields.has_key?(from) && !@fields.has_key?(to)
|
190
|
+
@fields[to] = @fields[from]
|
191
|
+
@fields.delete(from)
|
192
|
+
end
|
193
|
+
end
|
194
|
+
self
|
188
195
|
end
|
189
|
-
|
196
|
+
|
190
197
|
alias :rename_fields :rename
|
191
198
|
alias :rename_fields! :rename!
|
192
199
|
|
@@ -358,7 +365,25 @@ module BibTeX
|
|
358
365
|
protected
|
359
366
|
|
360
367
|
def default_key
|
361
|
-
|
368
|
+
a = case fields[:author]
|
369
|
+
when Names
|
370
|
+
author[0].last
|
371
|
+
when Value
|
372
|
+
author.to_s[/\w+/]
|
373
|
+
else
|
374
|
+
nil
|
375
|
+
end
|
376
|
+
|
377
|
+
case
|
378
|
+
when a && has_field?(:year) && has_field?(:title)
|
379
|
+
[a,year,title.to_s[/\w{4,}/]].join.downcase.to_sym
|
380
|
+
when a && has_field?(:year)
|
381
|
+
[a,year].join.downcase.to_sym
|
382
|
+
when has_field?(:year) && has_field?(:title)
|
383
|
+
[year,title.to_s[/\w{4,}/]].join.downcase.to_sym
|
384
|
+
else
|
385
|
+
object_id.to_s
|
386
|
+
end
|
362
387
|
end
|
363
388
|
|
364
389
|
end
|
data/lib/bibtex/entry.rbc
CHANGED
@@ -2697,7 +2697,7 @@ I
|
|
2697
2697
|
I
|
2698
2698
|
21
|
2699
2699
|
I
|
2700
|
-
|
2700
|
+
173
|
2701
2701
|
I
|
2702
2702
|
22
|
2703
2703
|
I
|
@@ -2713,7 +2713,7 @@ I
|
|
2713
2713
|
I
|
2714
2714
|
3e
|
2715
2715
|
I
|
2716
|
-
|
2716
|
+
173
|
2717
2717
|
I
|
2718
2718
|
3f
|
2719
2719
|
I
|
@@ -2864,7 +2864,7 @@ I
|
|
2864
2864
|
I
|
2865
2865
|
a
|
2866
2866
|
I
|
2867
|
-
|
2867
|
+
173
|
2868
2868
|
I
|
2869
2869
|
b
|
2870
2870
|
I
|
@@ -2872,7 +2872,7 @@ I
|
|
2872
2872
|
I
|
2873
2873
|
19
|
2874
2874
|
I
|
2875
|
-
|
2875
|
+
173
|
2876
2876
|
I
|
2877
2877
|
1a
|
2878
2878
|
I
|
@@ -3473,7 +3473,7 @@ x
|
|
3473
3473
|
14
|
3474
3474
|
method_missing
|
3475
3475
|
i
|
3476
|
-
|
3476
|
+
163
|
3477
3477
|
95
|
3478
3478
|
19
|
3479
3479
|
2
|
@@ -3486,19 +3486,16 @@ i
|
|
3486
3486
|
1
|
3487
3487
|
1
|
3488
3488
|
9
|
3489
|
-
|
3490
|
-
|
3489
|
+
22
|
3490
|
+
39
|
3491
|
+
0
|
3491
3492
|
20
|
3492
3493
|
0
|
3493
|
-
47
|
3494
3494
|
49
|
3495
3495
|
2
|
3496
3496
|
1
|
3497
|
-
11
|
3498
3497
|
8
|
3499
|
-
|
3500
|
-
1
|
3501
|
-
15
|
3498
|
+
162
|
3502
3499
|
20
|
3503
3500
|
0
|
3504
3501
|
49
|
@@ -3509,7 +3506,7 @@ i
|
|
3509
3506
|
13
|
3510
3507
|
70
|
3511
3508
|
9
|
3512
|
-
|
3509
|
+
45
|
3513
3510
|
15
|
3514
3511
|
44
|
3515
3512
|
43
|
@@ -3526,18 +3523,16 @@ i
|
|
3526
3523
|
8
|
3527
3524
|
1
|
3528
3525
|
9
|
3529
|
-
|
3526
|
+
74
|
3530
3527
|
5
|
3531
3528
|
7
|
3532
3529
|
9
|
3533
|
-
|
3534
|
-
|
3535
|
-
|
3536
|
-
|
3537
|
-
0
|
3538
|
-
49
|
3530
|
+
4
|
3531
|
+
5
|
3532
|
+
78
|
3533
|
+
98
|
3539
3534
|
10
|
3540
|
-
|
3535
|
+
2
|
3541
3536
|
49
|
3542
3537
|
11
|
3543
3538
|
0
|
@@ -3547,14 +3542,12 @@ i
|
|
3547
3542
|
49
|
3548
3543
|
2
|
3549
3544
|
1
|
3545
|
+
47
|
3550
3546
|
49
|
3551
3547
|
12
|
3552
3548
|
3
|
3553
|
-
11
|
3554
3549
|
8
|
3555
|
-
|
3556
|
-
1
|
3557
|
-
15
|
3550
|
+
162
|
3558
3551
|
20
|
3559
3552
|
0
|
3560
3553
|
7
|
@@ -3562,7 +3555,7 @@ i
|
|
3562
3555
|
13
|
3563
3556
|
70
|
3564
3557
|
9
|
3565
|
-
|
3558
|
+
94
|
3566
3559
|
15
|
3567
3560
|
44
|
3568
3561
|
43
|
@@ -3576,76 +3569,73 @@ i
|
|
3576
3569
|
6
|
3577
3570
|
13
|
3578
3571
|
49
|
3579
|
-
|
3572
|
+
8
|
3580
3573
|
1
|
3581
3574
|
9
|
3582
|
-
|
3575
|
+
159
|
3583
3576
|
4
|
3584
3577
|
5
|
3585
3578
|
79
|
3586
3579
|
98
|
3587
|
-
|
3580
|
+
10
|
3588
3581
|
2
|
3589
3582
|
9
|
3590
|
-
|
3583
|
+
133
|
3591
3584
|
5
|
3592
3585
|
4
|
3593
3586
|
5
|
3594
3587
|
78
|
3595
3588
|
98
|
3596
|
-
|
3589
|
+
10
|
3597
3590
|
2
|
3598
3591
|
20
|
3599
3592
|
2
|
3600
3593
|
13
|
3601
3594
|
70
|
3602
3595
|
10
|
3603
|
-
|
3596
|
+
127
|
3604
3597
|
44
|
3605
3598
|
43
|
3606
|
-
|
3599
|
+
15
|
3607
3600
|
12
|
3608
3601
|
49
|
3609
|
-
|
3602
|
+
16
|
3610
3603
|
1
|
3611
3604
|
47
|
3612
3605
|
50
|
3613
|
-
|
3606
|
+
17
|
3614
3607
|
1
|
3615
3608
|
8
|
3616
|
-
|
3609
|
+
157
|
3617
3610
|
5
|
3618
3611
|
4
|
3619
3612
|
5
|
3620
3613
|
78
|
3621
3614
|
98
|
3622
|
-
|
3615
|
+
10
|
3623
3616
|
2
|
3624
3617
|
20
|
3625
3618
|
2
|
3626
3619
|
13
|
3627
3620
|
70
|
3628
3621
|
10
|
3629
|
-
|
3622
|
+
153
|
3630
3623
|
44
|
3631
3624
|
43
|
3632
|
-
|
3625
|
+
15
|
3633
3626
|
12
|
3634
3627
|
49
|
3635
|
-
|
3628
|
+
16
|
3636
3629
|
1
|
3637
3630
|
47
|
3638
3631
|
50
|
3639
|
-
|
3632
|
+
18
|
3640
3633
|
1
|
3641
|
-
11
|
3642
3634
|
8
|
3643
|
-
|
3644
|
-
1
|
3645
|
-
15
|
3635
|
+
162
|
3646
3636
|
54
|
3647
3637
|
89
|
3648
|
-
|
3638
|
+
19
|
3649
3639
|
11
|
3650
3640
|
I
|
3651
3641
|
8
|
@@ -3658,7 +3648,7 @@ I
|
|
3658
3648
|
I
|
3659
3649
|
1
|
3660
3650
|
p
|
3661
|
-
|
3651
|
+
20
|
3662
3652
|
x
|
3663
3653
|
7
|
3664
3654
|
@fields
|
@@ -3676,20 +3666,20 @@ x
|
|
3676
3666
|
6
|
3677
3667
|
Regexp
|
3678
3668
|
s
|
3679
|
-
|
3680
|
-
=$
|
3669
|
+
7
|
3670
|
+
^(.+)=$
|
3681
3671
|
x
|
3682
3672
|
3
|
3683
3673
|
new
|
3684
3674
|
x
|
3685
|
-
|
3686
|
-
|
3675
|
+
2
|
3676
|
+
=~
|
3687
3677
|
x
|
3688
3678
|
3
|
3689
3679
|
add
|
3690
3680
|
x
|
3691
|
-
|
3692
|
-
|
3681
|
+
24
|
3682
|
+
regexp_last_match_result
|
3693
3683
|
x
|
3694
3684
|
6
|
3695
3685
|
to_sym
|
@@ -3701,12 +3691,6 @@ s
|
|
3701
3691
|
31
|
3702
3692
|
^(?:convert|from)_([a-z]+)(!)?$
|
3703
3693
|
x
|
3704
|
-
2
|
3705
|
-
=~
|
3706
|
-
x
|
3707
|
-
24
|
3708
|
-
regexp_last_match_result
|
3709
|
-
x
|
3710
3694
|
4
|
3711
3695
|
Proc
|
3712
3696
|
x
|
@@ -3730,41 +3714,41 @@ a2
|
|
3730
3714
|
I
|
3731
3715
|
4
|
3732
3716
|
I
|
3733
|
-
|
3717
|
+
a4
|
3734
3718
|
I
|
3735
|
-
|
3719
|
+
d
|
3736
3720
|
I
|
3737
|
-
|
3721
|
+
a5
|
3738
3722
|
I
|
3739
|
-
|
3723
|
+
16
|
3740
3724
|
I
|
3741
|
-
|
3725
|
+
a6
|
3742
3726
|
I
|
3743
|
-
|
3727
|
+
32
|
3744
3728
|
I
|
3745
|
-
|
3729
|
+
a7
|
3746
3730
|
I
|
3747
|
-
|
3731
|
+
4a
|
3748
3732
|
I
|
3749
|
-
|
3733
|
+
a8
|
3750
3734
|
I
|
3751
|
-
|
3735
|
+
63
|
3752
3736
|
I
|
3753
|
-
|
3737
|
+
a9
|
3754
3738
|
I
|
3755
|
-
|
3739
|
+
9d
|
3756
3740
|
I
|
3757
|
-
|
3741
|
+
0
|
3758
3742
|
I
|
3759
|
-
|
3743
|
+
9f
|
3760
3744
|
I
|
3761
|
-
|
3745
|
+
ab
|
3762
3746
|
I
|
3763
|
-
|
3747
|
+
a2
|
3764
3748
|
I
|
3765
|
-
|
3749
|
+
0
|
3766
3750
|
I
|
3767
|
-
|
3751
|
+
a3
|
3768
3752
|
x
|
3769
3753
|
53
|
3770
3754
|
/Users/sylvester/Work/bibtex-ruby/lib/bibtex/entry.rb
|
@@ -3917,11 +3901,11 @@ p
|
|
3917
3901
|
I
|
3918
3902
|
-1
|
3919
3903
|
I
|
3920
|
-
|
3904
|
+
af
|
3921
3905
|
I
|
3922
3906
|
0
|
3923
3907
|
I
|
3924
|
-
|
3908
|
+
b0
|
3925
3909
|
I
|
3926
3910
|
4b
|
3927
3911
|
x
|
@@ -3978,11 +3962,11 @@ p
|
|
3978
3962
|
I
|
3979
3963
|
-1
|
3980
3964
|
I
|
3981
|
-
|
3965
|
+
b4
|
3982
3966
|
I
|
3983
3967
|
0
|
3984
3968
|
I
|
3985
|
-
|
3969
|
+
b5
|
3986
3970
|
I
|
3987
3971
|
b
|
3988
3972
|
x
|
@@ -4159,23 +4143,23 @@ p
|
|
4159
4143
|
I
|
4160
4144
|
0
|
4161
4145
|
I
|
4162
|
-
|
4146
|
+
bb
|
4163
4147
|
I
|
4164
4148
|
a
|
4165
4149
|
I
|
4166
|
-
|
4150
|
+
bc
|
4167
4151
|
I
|
4168
4152
|
24
|
4169
4153
|
I
|
4170
|
-
|
4154
|
+
bd
|
4171
4155
|
I
|
4172
4156
|
37
|
4173
4157
|
I
|
4174
|
-
|
4158
|
+
be
|
4175
4159
|
I
|
4176
4160
|
40
|
4177
4161
|
I
|
4178
|
-
|
4162
|
+
bc
|
4179
4163
|
I
|
4180
4164
|
41
|
4181
4165
|
I
|
@@ -4201,15 +4185,15 @@ p
|
|
4201
4185
|
I
|
4202
4186
|
-1
|
4203
4187
|
I
|
4204
|
-
|
4188
|
+
ba
|
4205
4189
|
I
|
4206
4190
|
0
|
4207
4191
|
I
|
4208
|
-
|
4192
|
+
bb
|
4209
4193
|
I
|
4210
4194
|
13
|
4211
4195
|
I
|
4212
|
-
|
4196
|
+
c1
|
4213
4197
|
I
|
4214
4198
|
15
|
4215
4199
|
x
|
@@ -4271,11 +4255,11 @@ p
|
|
4271
4255
|
I
|
4272
4256
|
-1
|
4273
4257
|
I
|
4274
|
-
|
4258
|
+
c8
|
4275
4259
|
I
|
4276
4260
|
0
|
4277
4261
|
I
|
4278
|
-
|
4262
|
+
c9
|
4279
4263
|
I
|
4280
4264
|
b
|
4281
4265
|
x
|
@@ -4330,11 +4314,11 @@ p
|
|
4330
4314
|
I
|
4331
4315
|
-1
|
4332
4316
|
I
|
4333
|
-
|
4317
|
+
ce
|
4334
4318
|
I
|
4335
4319
|
0
|
4336
4320
|
I
|
4337
|
-
|
4321
|
+
cf
|
4338
4322
|
I
|
4339
4323
|
d
|
4340
4324
|
x
|
@@ -4508,11 +4492,11 @@ p
|
|
4508
4492
|
I
|
4509
4493
|
0
|
4510
4494
|
I
|
4511
|
-
|
4495
|
+
dc
|
4512
4496
|
I
|
4513
4497
|
a
|
4514
4498
|
I
|
4515
|
-
|
4499
|
+
dd
|
4516
4500
|
I
|
4517
4501
|
35
|
4518
4502
|
x
|
@@ -4534,15 +4518,15 @@ p
|
|
4534
4518
|
I
|
4535
4519
|
-1
|
4536
4520
|
I
|
4537
|
-
|
4521
|
+
db
|
4538
4522
|
I
|
4539
4523
|
0
|
4540
4524
|
I
|
4541
|
-
|
4525
|
+
dc
|
4542
4526
|
I
|
4543
4527
|
13
|
4544
4528
|
I
|
4545
|
-
|
4529
|
+
df
|
4546
4530
|
I
|
4547
4531
|
15
|
4548
4532
|
x
|
@@ -4604,11 +4588,11 @@ p
|
|
4604
4588
|
I
|
4605
4589
|
-1
|
4606
4590
|
I
|
4607
|
-
|
4591
|
+
e6
|
4608
4592
|
I
|
4609
4593
|
0
|
4610
4594
|
I
|
4611
|
-
|
4595
|
+
e7
|
4612
4596
|
I
|
4613
4597
|
b
|
4614
4598
|
x
|
@@ -4773,11 +4757,11 @@ p
|
|
4773
4757
|
I
|
4774
4758
|
0
|
4775
4759
|
I
|
4776
|
-
|
4760
|
+
ed
|
4777
4761
|
I
|
4778
4762
|
4
|
4779
4763
|
I
|
4780
|
-
|
4764
|
+
ee
|
4781
4765
|
I
|
4782
4766
|
33
|
4783
4767
|
I
|
@@ -4800,11 +4784,11 @@ p
|
|
4800
4784
|
I
|
4801
4785
|
-1
|
4802
4786
|
I
|
4803
|
-
|
4787
|
+
ec
|
4804
4788
|
I
|
4805
4789
|
0
|
4806
4790
|
I
|
4807
|
-
|
4791
|
+
ed
|
4808
4792
|
I
|
4809
4793
|
e
|
4810
4794
|
x
|
@@ -4962,19 +4946,19 @@ p
|
|
4962
4946
|
I
|
4963
4947
|
-1
|
4964
4948
|
I
|
4965
|
-
|
4949
|
+
f3
|
4966
4950
|
I
|
4967
4951
|
0
|
4968
4952
|
I
|
4969
|
-
|
4953
|
+
f4
|
4970
4954
|
I
|
4971
4955
|
4
|
4972
4956
|
I
|
4973
|
-
|
4957
|
+
f5
|
4974
4958
|
I
|
4975
4959
|
15
|
4976
4960
|
I
|
4977
|
-
|
4961
|
+
f6
|
4978
4962
|
I
|
4979
4963
|
27
|
4980
4964
|
I
|
@@ -4982,7 +4966,7 @@ I
|
|
4982
4966
|
I
|
4983
4967
|
28
|
4984
4968
|
I
|
4985
|
-
|
4969
|
+
f7
|
4986
4970
|
I
|
4987
4971
|
3a
|
4988
4972
|
I
|
@@ -4990,7 +4974,7 @@ I
|
|
4990
4974
|
I
|
4991
4975
|
3b
|
4992
4976
|
I
|
4993
|
-
|
4977
|
+
f8
|
4994
4978
|
I
|
4995
4979
|
59
|
4996
4980
|
I
|
@@ -4998,7 +4982,7 @@ I
|
|
4998
4982
|
I
|
4999
4983
|
5a
|
5000
4984
|
I
|
5001
|
-
|
4985
|
+
f9
|
5002
4986
|
I
|
5003
4987
|
5c
|
5004
4988
|
x
|
@@ -5072,19 +5056,19 @@ p
|
|
5072
5056
|
I
|
5073
5057
|
-1
|
5074
5058
|
I
|
5075
|
-
|
5059
|
+
fd
|
5076
5060
|
I
|
5077
5061
|
0
|
5078
5062
|
I
|
5079
|
-
|
5063
|
+
fe
|
5080
5064
|
I
|
5081
5065
|
4
|
5082
5066
|
I
|
5083
|
-
|
5067
|
+
ff
|
5084
5068
|
I
|
5085
5069
|
15
|
5086
5070
|
I
|
5087
|
-
|
5071
|
+
100
|
5088
5072
|
I
|
5089
5073
|
17
|
5090
5074
|
x
|
@@ -5220,7 +5204,7 @@ p
|
|
5220
5204
|
I
|
5221
5205
|
0
|
5222
5206
|
I
|
5223
|
-
|
5207
|
+
105
|
5224
5208
|
I
|
5225
5209
|
f
|
5226
5210
|
x
|
@@ -5239,11 +5223,11 @@ p
|
|
5239
5223
|
I
|
5240
5224
|
-1
|
5241
5225
|
I
|
5242
|
-
|
5226
|
+
103
|
5243
5227
|
I
|
5244
5228
|
0
|
5245
5229
|
I
|
5246
|
-
|
5230
|
+
104
|
5247
5231
|
I
|
5248
5232
|
15
|
5249
5233
|
I
|
@@ -5251,11 +5235,11 @@ I
|
|
5251
5235
|
I
|
5252
5236
|
16
|
5253
5237
|
I
|
5254
|
-
|
5238
|
+
105
|
5255
5239
|
I
|
5256
5240
|
21
|
5257
5241
|
I
|
5258
|
-
|
5242
|
+
106
|
5259
5243
|
I
|
5260
5244
|
23
|
5261
5245
|
x
|
@@ -5336,15 +5320,15 @@ p
|
|
5336
5320
|
I
|
5337
5321
|
-1
|
5338
5322
|
I
|
5339
|
-
|
5323
|
+
109
|
5340
5324
|
I
|
5341
5325
|
0
|
5342
5326
|
I
|
5343
|
-
|
5327
|
+
10a
|
5344
5328
|
I
|
5345
5329
|
16
|
5346
5330
|
I
|
5347
|
-
|
5331
|
+
10b
|
5348
5332
|
I
|
5349
5333
|
18
|
5350
5334
|
x
|
@@ -5416,11 +5400,11 @@ p
|
|
5416
5400
|
I
|
5417
5401
|
-1
|
5418
5402
|
I
|
5419
|
-
|
5403
|
+
10e
|
5420
5404
|
I
|
5421
5405
|
0
|
5422
5406
|
I
|
5423
|
-
|
5407
|
+
10f
|
5424
5408
|
I
|
5425
5409
|
14
|
5426
5410
|
x
|
@@ -5517,11 +5501,11 @@ p
|
|
5517
5501
|
I
|
5518
5502
|
-1
|
5519
5503
|
I
|
5520
|
-
|
5504
|
+
112
|
5521
5505
|
I
|
5522
5506
|
0
|
5523
5507
|
I
|
5524
|
-
|
5508
|
+
113
|
5525
5509
|
I
|
5526
5510
|
24
|
5527
5511
|
I
|
@@ -5529,7 +5513,7 @@ I
|
|
5529
5513
|
I
|
5530
5514
|
25
|
5531
5515
|
I
|
5532
|
-
|
5516
|
+
114
|
5533
5517
|
I
|
5534
5518
|
27
|
5535
5519
|
x
|
@@ -5708,27 +5692,27 @@ p
|
|
5708
5692
|
I
|
5709
5693
|
0
|
5710
5694
|
I
|
5711
|
-
|
5695
|
+
11d
|
5712
5696
|
I
|
5713
5697
|
4
|
5714
5698
|
I
|
5715
|
-
|
5699
|
+
11e
|
5716
5700
|
I
|
5717
5701
|
f
|
5718
5702
|
I
|
5719
|
-
|
5703
|
+
11f
|
5720
5704
|
I
|
5721
5705
|
1b
|
5722
5706
|
I
|
5723
|
-
|
5707
|
+
120
|
5724
5708
|
I
|
5725
5709
|
23
|
5726
5710
|
I
|
5727
|
-
|
5711
|
+
121
|
5728
5712
|
I
|
5729
5713
|
32
|
5730
5714
|
I
|
5731
|
-
|
5715
|
+
11e
|
5732
5716
|
I
|
5733
5717
|
33
|
5734
5718
|
I
|
@@ -5754,23 +5738,23 @@ p
|
|
5754
5738
|
I
|
5755
5739
|
-1
|
5756
5740
|
I
|
5757
|
-
|
5741
|
+
11b
|
5758
5742
|
I
|
5759
5743
|
0
|
5760
5744
|
I
|
5761
|
-
|
5745
|
+
11c
|
5762
5746
|
I
|
5763
5747
|
12
|
5764
5748
|
I
|
5765
|
-
|
5749
|
+
11c
|
5766
5750
|
I
|
5767
5751
|
15
|
5768
5752
|
I
|
5769
|
-
|
5753
|
+
11d
|
5770
5754
|
I
|
5771
5755
|
1e
|
5772
5756
|
I
|
5773
|
-
|
5757
|
+
124
|
5774
5758
|
I
|
5775
5759
|
20
|
5776
5760
|
x
|
@@ -5919,7 +5903,7 @@ p
|
|
5919
5903
|
I
|
5920
5904
|
0
|
5921
5905
|
I
|
5922
|
-
|
5906
|
+
129
|
5923
5907
|
I
|
5924
5908
|
24
|
5925
5909
|
x
|
@@ -5948,11 +5932,11 @@ p
|
|
5948
5932
|
I
|
5949
5933
|
-1
|
5950
5934
|
I
|
5951
|
-
|
5935
|
+
128
|
5952
5936
|
I
|
5953
5937
|
e
|
5954
5938
|
I
|
5955
|
-
|
5939
|
+
129
|
5956
5940
|
I
|
5957
5941
|
1c
|
5958
5942
|
x
|
@@ -6169,15 +6153,15 @@ p
|
|
6169
6153
|
I
|
6170
6154
|
-1
|
6171
6155
|
I
|
6172
|
-
|
6156
|
+
12d
|
6173
6157
|
I
|
6174
6158
|
e
|
6175
6159
|
I
|
6176
|
-
|
6160
|
+
12e
|
6177
6161
|
I
|
6178
6162
|
31
|
6179
6163
|
I
|
6180
|
-
|
6164
|
+
12f
|
6181
6165
|
I
|
6182
6166
|
70
|
6183
6167
|
x
|
@@ -6395,7 +6379,7 @@ p
|
|
6395
6379
|
I
|
6396
6380
|
0
|
6397
6381
|
I
|
6398
|
-
|
6382
|
+
135
|
6399
6383
|
I
|
6400
6384
|
1f
|
6401
6385
|
x
|
@@ -6417,23 +6401,23 @@ p
|
|
6417
6401
|
I
|
6418
6402
|
-1
|
6419
6403
|
I
|
6420
|
-
|
6404
|
+
132
|
6421
6405
|
I
|
6422
6406
|
e
|
6423
6407
|
I
|
6424
|
-
|
6408
|
+
133
|
6425
6409
|
I
|
6426
6410
|
31
|
6427
6411
|
I
|
6428
|
-
|
6412
|
+
134
|
6429
6413
|
I
|
6430
6414
|
4f
|
6431
6415
|
I
|
6432
|
-
|
6416
|
+
135
|
6433
6417
|
I
|
6434
6418
|
57
|
6435
6419
|
I
|
6436
|
-
|
6420
|
+
136
|
6437
6421
|
I
|
6438
6422
|
5a
|
6439
6423
|
x
|
@@ -6724,11 +6708,11 @@ p
|
|
6724
6708
|
I
|
6725
6709
|
0
|
6726
6710
|
I
|
6727
|
-
|
6711
|
+
13c
|
6728
6712
|
I
|
6729
6713
|
a
|
6730
6714
|
I
|
6731
|
-
|
6715
|
+
13d
|
6732
6716
|
I
|
6733
6717
|
34
|
6734
6718
|
I
|
@@ -6760,27 +6744,27 @@ p
|
|
6760
6744
|
I
|
6761
6745
|
-1
|
6762
6746
|
I
|
6763
|
-
|
6747
|
+
139
|
6764
6748
|
I
|
6765
6749
|
e
|
6766
6750
|
I
|
6767
|
-
|
6751
|
+
13a
|
6768
6752
|
I
|
6769
6753
|
2b
|
6770
6754
|
I
|
6771
|
-
|
6755
|
+
13b
|
6772
6756
|
I
|
6773
6757
|
57
|
6774
6758
|
I
|
6775
|
-
|
6759
|
+
13c
|
6776
6760
|
I
|
6777
6761
|
5f
|
6778
6762
|
I
|
6779
|
-
|
6763
|
+
13f
|
6780
6764
|
I
|
6781
6765
|
6f
|
6782
6766
|
I
|
6783
|
-
|
6767
|
+
140
|
6784
6768
|
I
|
6785
6769
|
72
|
6786
6770
|
x
|
@@ -6973,15 +6957,15 @@ p
|
|
6973
6957
|
I
|
6974
6958
|
-1
|
6975
6959
|
I
|
6976
|
-
|
6960
|
+
143
|
6977
6961
|
I
|
6978
6962
|
0
|
6979
6963
|
I
|
6980
|
-
|
6964
|
+
144
|
6981
6965
|
I
|
6982
6966
|
1e
|
6983
6967
|
I
|
6984
|
-
|
6968
|
+
145
|
6985
6969
|
I
|
6986
6970
|
2f
|
6987
6971
|
I
|
@@ -6989,7 +6973,7 @@ I
|
|
6989
6973
|
I
|
6990
6974
|
30
|
6991
6975
|
I
|
6992
|
-
|
6976
|
+
146
|
6993
6977
|
I
|
6994
6978
|
60
|
6995
6979
|
x
|
@@ -7291,19 +7275,19 @@ p
|
|
7291
7275
|
I
|
7292
7276
|
0
|
7293
7277
|
I
|
7294
|
-
|
7278
|
+
150
|
7295
7279
|
I
|
7296
7280
|
a
|
7297
7281
|
I
|
7298
|
-
|
7282
|
+
151
|
7299
7283
|
I
|
7300
7284
|
31
|
7301
7285
|
I
|
7302
|
-
|
7286
|
+
152
|
7303
7287
|
I
|
7304
7288
|
43
|
7305
7289
|
I
|
7306
|
-
|
7290
|
+
153
|
7307
7291
|
I
|
7308
7292
|
4c
|
7309
7293
|
x
|
@@ -7328,27 +7312,27 @@ p
|
|
7328
7312
|
I
|
7329
7313
|
-1
|
7330
7314
|
I
|
7331
|
-
|
7315
|
+
14b
|
7332
7316
|
I
|
7333
7317
|
e
|
7334
7318
|
I
|
7335
|
-
|
7319
|
+
14c
|
7336
7320
|
I
|
7337
7321
|
17
|
7338
7322
|
I
|
7339
|
-
|
7323
|
+
14e
|
7340
7324
|
I
|
7341
7325
|
3a
|
7342
7326
|
I
|
7343
|
-
|
7327
|
+
14f
|
7344
7328
|
I
|
7345
7329
|
4d
|
7346
7330
|
I
|
7347
|
-
|
7331
|
+
150
|
7348
7332
|
I
|
7349
7333
|
55
|
7350
7334
|
I
|
7351
|
-
|
7335
|
+
155
|
7352
7336
|
I
|
7353
7337
|
58
|
7354
7338
|
x
|
@@ -7469,11 +7453,11 @@ p
|
|
7469
7453
|
I
|
7470
7454
|
-1
|
7471
7455
|
I
|
7472
|
-
|
7456
|
+
15e
|
7473
7457
|
I
|
7474
7458
|
0
|
7475
7459
|
I
|
7476
|
-
|
7460
|
+
15f
|
7477
7461
|
I
|
7478
7462
|
38
|
7479
7463
|
I
|
@@ -7599,7 +7583,7 @@ p
|
|
7599
7583
|
I
|
7600
7584
|
0
|
7601
7585
|
I
|
7602
|
-
|
7586
|
+
164
|
7603
7587
|
I
|
7604
7588
|
29
|
7605
7589
|
I
|
@@ -7625,15 +7609,15 @@ p
|
|
7625
7609
|
I
|
7626
7610
|
-1
|
7627
7611
|
I
|
7628
|
-
|
7612
|
+
163
|
7629
7613
|
I
|
7630
7614
|
0
|
7631
7615
|
I
|
7632
|
-
|
7616
|
+
164
|
7633
7617
|
I
|
7634
7618
|
8
|
7635
7619
|
I
|
7636
|
-
|
7620
|
+
165
|
7637
7621
|
I
|
7638
7622
|
a
|
7639
7623
|
x
|
@@ -7761,11 +7745,11 @@ p
|
|
7761
7745
|
I
|
7762
7746
|
-1
|
7763
7747
|
I
|
7764
|
-
|
7748
|
+
168
|
7765
7749
|
I
|
7766
7750
|
0
|
7767
7751
|
I
|
7768
|
-
|
7752
|
+
169
|
7769
7753
|
I
|
7770
7754
|
49
|
7771
7755
|
I
|
@@ -7830,11 +7814,11 @@ p
|
|
7830
7814
|
I
|
7831
7815
|
-1
|
7832
7816
|
I
|
7833
|
-
|
7817
|
+
16e
|
7834
7818
|
I
|
7835
7819
|
0
|
7836
7820
|
I
|
7837
|
-
|
7821
|
+
16f
|
7838
7822
|
I
|
7839
7823
|
a
|
7840
7824
|
x
|
@@ -8151,127 +8135,127 @@ a2
|
|
8151
8135
|
I
|
8152
8136
|
3cf
|
8153
8137
|
I
|
8154
|
-
|
8138
|
+
af
|
8155
8139
|
I
|
8156
8140
|
3dd
|
8157
8141
|
I
|
8158
|
-
|
8142
|
+
b4
|
8159
8143
|
I
|
8160
8144
|
3eb
|
8161
8145
|
I
|
8162
|
-
|
8146
|
+
ba
|
8163
8147
|
I
|
8164
8148
|
3f9
|
8165
8149
|
I
|
8166
|
-
|
8150
|
+
c4
|
8167
8151
|
I
|
8168
8152
|
403
|
8169
8153
|
I
|
8170
|
-
|
8154
|
+
c5
|
8171
8155
|
I
|
8172
8156
|
40d
|
8173
8157
|
I
|
8174
|
-
|
8158
|
+
c8
|
8175
8159
|
I
|
8176
8160
|
41b
|
8177
8161
|
I
|
8178
|
-
|
8162
|
+
ce
|
8179
8163
|
I
|
8180
8164
|
429
|
8181
8165
|
I
|
8182
|
-
|
8166
|
+
db
|
8183
8167
|
I
|
8184
8168
|
437
|
8185
8169
|
I
|
8186
|
-
|
8170
|
+
e2
|
8187
8171
|
I
|
8188
8172
|
441
|
8189
8173
|
I
|
8190
|
-
|
8174
|
+
e6
|
8191
8175
|
I
|
8192
8176
|
44f
|
8193
8177
|
I
|
8194
|
-
|
8178
|
+
ec
|
8195
8179
|
I
|
8196
8180
|
45d
|
8197
8181
|
I
|
8198
|
-
|
8182
|
+
f3
|
8199
8183
|
I
|
8200
8184
|
46b
|
8201
8185
|
I
|
8202
|
-
|
8186
|
+
fd
|
8203
8187
|
I
|
8204
8188
|
479
|
8205
8189
|
I
|
8206
|
-
|
8190
|
+
103
|
8207
8191
|
I
|
8208
8192
|
487
|
8209
8193
|
I
|
8210
|
-
|
8194
|
+
109
|
8211
8195
|
I
|
8212
8196
|
495
|
8213
8197
|
I
|
8214
|
-
|
8198
|
+
10e
|
8215
8199
|
I
|
8216
8200
|
4a3
|
8217
8201
|
I
|
8218
|
-
|
8202
|
+
112
|
8219
8203
|
I
|
8220
8204
|
4b1
|
8221
8205
|
I
|
8222
|
-
|
8206
|
+
117
|
8223
8207
|
I
|
8224
8208
|
4bb
|
8225
8209
|
I
|
8226
|
-
|
8210
|
+
11b
|
8227
8211
|
I
|
8228
8212
|
4c9
|
8229
8213
|
I
|
8230
|
-
|
8214
|
+
128
|
8231
8215
|
I
|
8232
8216
|
4d7
|
8233
8217
|
I
|
8234
|
-
|
8218
|
+
12d
|
8235
8219
|
I
|
8236
8220
|
4e5
|
8237
8221
|
I
|
8238
|
-
|
8222
|
+
132
|
8239
8223
|
I
|
8240
8224
|
4f3
|
8241
8225
|
I
|
8242
|
-
|
8226
|
+
139
|
8243
8227
|
I
|
8244
8228
|
501
|
8245
8229
|
I
|
8246
|
-
|
8230
|
+
143
|
8247
8231
|
I
|
8248
8232
|
50f
|
8249
8233
|
I
|
8250
|
-
|
8234
|
+
149
|
8251
8235
|
I
|
8252
8236
|
519
|
8253
8237
|
I
|
8254
|
-
|
8238
|
+
14b
|
8255
8239
|
I
|
8256
8240
|
527
|
8257
8241
|
I
|
8258
|
-
|
8242
|
+
15e
|
8259
8243
|
I
|
8260
8244
|
535
|
8261
8245
|
I
|
8262
|
-
|
8246
|
+
163
|
8263
8247
|
I
|
8264
8248
|
543
|
8265
8249
|
I
|
8266
|
-
|
8250
|
+
168
|
8267
8251
|
I
|
8268
8252
|
551
|
8269
8253
|
I
|
8270
|
-
|
8254
|
+
16c
|
8271
8255
|
I
|
8272
8256
|
555
|
8273
8257
|
I
|
8274
|
-
|
8258
|
+
16e
|
8275
8259
|
I
|
8276
8260
|
563
|
8277
8261
|
x
|