kramdown 0.5.0 → 0.6.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of kramdown might be problematic. Click here for more details.

Files changed (43) hide show
  1. data/ChangeLog +315 -0
  2. data/Rakefile +35 -0
  3. data/VERSION +1 -1
  4. data/benchmark/generate_data.rb +6 -4
  5. data/benchmark/historic-jruby-1.4.0.dat +7 -7
  6. data/benchmark/historic-ruby-1.8.6.dat +7 -7
  7. data/benchmark/historic-ruby-1.8.7.dat +7 -7
  8. data/benchmark/historic-ruby-1.9.1p243.dat +7 -7
  9. data/benchmark/historic-ruby-1.9.2dev.dat +7 -7
  10. data/bin/kramdown +15 -4
  11. data/data/kramdown/document.html +9 -0
  12. data/data/kramdown/document.latex +38 -0
  13. data/doc/default.less.css +468 -0
  14. data/doc/default.template +23 -34
  15. data/doc/index.page +25 -20
  16. data/doc/news.page +1 -1
  17. data/doc/syntax.page +226 -159
  18. data/doc/tests.page +2 -1
  19. data/lib/kramdown/converter/html.rb +14 -2
  20. data/lib/kramdown/converter/latex.rb +19 -1
  21. data/lib/kramdown/document.rb +17 -9
  22. data/lib/kramdown/parser/kramdown.rb +4 -3
  23. data/lib/kramdown/parser/kramdown/autolink.rb +7 -2
  24. data/lib/kramdown/parser/kramdown/emphasis.rb +3 -2
  25. data/lib/kramdown/parser/kramdown/escaped_chars.rb +1 -1
  26. data/lib/kramdown/parser/kramdown/list.rb +2 -1
  27. data/lib/kramdown/parser/kramdown/math.rb +53 -0
  28. data/lib/kramdown/version.rb +1 -1
  29. data/man/man1/kramdown.1 +189 -0
  30. data/test/testcases/block/08_list/mixed.html +9 -3
  31. data/test/testcases/block/08_list/special_cases.html +49 -0
  32. data/test/testcases/block/08_list/special_cases.text +29 -0
  33. data/test/testcases/block/15_math/normal.html +19 -0
  34. data/test/testcases/block/15_math/normal.text +18 -0
  35. data/test/testcases/span/02_emphasis/errors.html +1 -1
  36. data/test/testcases/span/02_emphasis/nesting.html +4 -0
  37. data/test/testcases/span/02_emphasis/nesting.text +3 -0
  38. data/test/testcases/span/autolinks/url_links.html +3 -0
  39. data/test/testcases/span/autolinks/url_links.text +3 -0
  40. data/test/testcases/span/math/normal.html +5 -0
  41. data/test/testcases/span/math/normal.text +5 -0
  42. metadata +21 -6
  43. data/doc/default.css +0 -293
data/ChangeLog CHANGED
@@ -1,3 +1,318 @@
1
+ commit 01986057b7e458aaf352f7d8fddb587ae2fcc16e
2
+ Author: Thomas Leitner <t_leitner@gmx.at>
3
+ Date: Tue Apr 6 12:13:36 2010 +0200
4
+
5
+ Added benchmark data for 0.6.0 release and updated graphs
6
+
7
+ benchmark/historic-jruby-1.4.0.dat
8
+ benchmark/historic-ruby-1.8.6.dat
9
+ benchmark/historic-ruby-1.8.7.dat
10
+ benchmark/historic-ruby-1.9.1p243.dat
11
+ benchmark/historic-ruby-1.9.2dev.dat
12
+ doc/img/graph-jruby-1.4.0.png
13
+ doc/img/graph-ruby-1.8.6.png
14
+ doc/img/graph-ruby-1.8.7.png
15
+ doc/img/graph-ruby-1.9.1p243.png
16
+ doc/img/graph-ruby-1.9.2dev.png
17
+ doc/tests.page
18
+
19
+ commit 712aed9b546e75458e030606c6f5c60cbee45629
20
+ Author: Thomas Leitner <t_leitner@gmx.at>
21
+ Date: Tue Apr 6 12:12:50 2010 +0200
22
+
23
+ Now only showing kramdown performance in graphs
24
+
25
+ benchmark/generate_data.rb
26
+
27
+ commit d3f3426ce66aeaf2ca317efc59ecc42a78a1d3ad
28
+ Author: Thomas Leitner <t_leitner@gmx.at>
29
+ Date: Tue Apr 6 11:41:19 2010 +0200
30
+
31
+ Removed old benchmark data
32
+
33
+ benchmark/historic-jruby-1.4.0.dat
34
+ benchmark/historic-ruby-1.8.6.dat
35
+ benchmark/historic-ruby-1.8.7.dat
36
+ benchmark/historic-ruby-1.9.1p243.dat
37
+ benchmark/historic-ruby-1.9.2dev.dat
38
+
39
+ commit acde8528e26f40af2192b25dc939b62ff20b27fb
40
+ Author: Thomas Leitner <t_leitner@gmx.at>
41
+ Date: Tue Apr 6 11:27:09 2010 +0200
42
+
43
+ Small credit fix
44
+
45
+ doc/default.template
46
+
47
+ commit 7152ad65def87001ec8b2b61955d38c8ded064cb
48
+ Author: Thomas Leitner <t_leitner@gmx.at>
49
+ Date: Thu Mar 18 20:44:57 2010 +0100
50
+
51
+ Updated release date and front matter
52
+
53
+ doc/index.page
54
+ doc/news/release_0_6_0.page
55
+
56
+ commit 8b99bc030f7c97ddb78f6d8b9b5a161bf5cd4aa2
57
+ Author: Thomas Leitner <t_leitner@gmx.at>
58
+ Date: Thu Mar 18 20:43:37 2010 +0100
59
+
60
+ Fixed some style issues
61
+
62
+ doc/default.less.css
63
+ doc/news.page
64
+
65
+ commit a82a70715298bee2659e387ea4622b4e87285b2f
66
+ Author: Thomas Leitner <t_leitner@gmx.at>
67
+ Date: Thu Mar 18 20:42:46 2010 +0100
68
+
69
+ Updated release notes
70
+
71
+ doc/news/release_0_6_0.page
72
+
73
+ commit dc64a5fa47202f01eb829d5fc5f389f35014ea69
74
+ Author: Thomas Leitner <t_leitner@gmx.at>
75
+ Date: Wed Mar 17 18:27:59 2010 +0100
76
+
77
+ Updated documentation
78
+
79
+ Moved HTML/LaTeX specific parts of the syntax document to the converter
80
+ documents.
81
+
82
+ doc/converter/html.page
83
+ doc/converter/latex.page
84
+ doc/syntax.page
85
+
86
+ commit 397dafe8664affaa7ca0e3895b683bc32f73d637
87
+ Author: Thomas Leitner <t_leitner@gmx.at>
88
+ Date: Wed Mar 17 18:27:11 2010 +0100
89
+
90
+ Updated styling of homepage
91
+
92
+ doc/default.css
93
+ doc/default.less.css
94
+ doc/default.template
95
+ doc/index.page
96
+
97
+ commit ad6b4a2c203a2728c8564312ede3b3b6aef9cf07
98
+ Author: Thomas Leitner <t_leitner@gmx.at>
99
+ Date: Tue Mar 16 14:18:16 2010 +0100
100
+
101
+ Small syntax change for the last list item
102
+
103
+ It is now also wrapped in a paragraph if all other list items are
104
+ also wrapped in a paragraph.
105
+
106
+ doc/news/release_0_6_0.page
107
+ doc/syntax.page
108
+ lib/kramdown/parser/kramdown/list.rb
109
+ test/testcases/block/08_list/mixed.html
110
+ test/testcases/block/08_list/special_cases.html
111
+ test/testcases/block/08_list/special_cases.text
112
+
113
+ commit 52441c4c0eea53f8f8af699c799bf4459a2baff2
114
+ Author: Thomas Leitner <t_leitner@gmx.at>
115
+ Date: Sun Mar 14 19:42:22 2010 +0100
116
+
117
+ Fixed typo in manual page
118
+
119
+ man/man1/kramdown.1.erb
120
+
121
+ commit 5b5bf7f100cb99ee2f8f95ad30201220f22607b1
122
+ Author: Thomas Leitner <t_leitner@gmx.at>
123
+ Date: Fri Mar 12 13:10:40 2010 +0100
124
+
125
+ Fixed problem with missing data files
126
+
127
+ Rakefile
128
+ doc/news/release_0_6_0.page
129
+
130
+ commit 7e579fdcb40f68aaf0219e6fe3d2f34192900d87
131
+ Author: Thomas Leitner <t_leitner@gmx.at>
132
+ Date: Tue Mar 2 14:45:49 2010 +0100
133
+
134
+ Fixed performance problem with emphasis parsing
135
+
136
+ Backtracking in the emphasis parser lead to poor performance. Nesting
137
+ em or strong emphasis is now forbidden to prevent this.
138
+
139
+ doc/news/release_0_6_0.page
140
+ doc/syntax.page
141
+ lib/kramdown/parser/kramdown.rb
142
+ lib/kramdown/parser/kramdown/emphasis.rb
143
+ test/testcases/span/02_emphasis/errors.html
144
+ test/testcases/span/02_emphasis/nesting.html
145
+ test/testcases/span/02_emphasis/nesting.text
146
+
147
+ commit 07b1bd5156d7c6c1f627bdf3d94bad886bc5ac5f
148
+ Author: Thomas Leitner <t_leitner@gmx.at>
149
+ Date: Tue Feb 23 16:30:04 2010 +0100
150
+
151
+ Added a new CLI option -i and changed -f to -o with deprecation
152
+
153
+ The option -i can be used to select the input format. The Document class has
154
+ been adjusted to take care of the special key :input.
155
+
156
+ bin/kramdown
157
+ doc/news/release_0_6_0.page
158
+ lib/kramdown/document.rb
159
+
160
+ commit 74754c6cc3032aed6583ae77d6b68aac4296eb6e
161
+ Author: Thomas Leitner <t_leitner@gmx.at>
162
+ Date: Sat Feb 20 21:39:33 2010 +0100
163
+
164
+ Small fix for LaTeX converter
165
+
166
+ lib/kramdown/converter/latex.rb
167
+
168
+ commit 51d2021527d6ac6be6c4e9ec19b3522546fb8e7b
169
+ Author: Thomas Leitner <t_leitner@gmx.at>
170
+ Date: Sat Feb 20 21:38:40 2010 +0100
171
+
172
+ Added documentation on available parsers and converters
173
+
174
+ Rakefile
175
+ doc/converter/html.page
176
+ doc/converter/latex.page
177
+ doc/index.page
178
+ doc/parser/kramdown.page
179
+
180
+ commit 39e8750b0a1b36dfc390815c55b591da77f08783
181
+ Author: Thomas Leitner <t_leitner@gmx.at>
182
+ Date: Sat Feb 20 09:33:36 2010 +0100
183
+
184
+ Added man page for kramdown binary
185
+
186
+ Rakefile
187
+ doc/news/release_0_6_0.page
188
+ man/man1/kramdown.1.erb
189
+
190
+ commit a77e52be4d08c46dbb152cc1a9480c13de9b6da6
191
+ Author: Thomas Leitner <t_leitner@gmx.at>
192
+ Date: Fri Feb 19 12:12:39 2010 +0100
193
+
194
+ Added jsMath package to documentation
195
+
196
+ doc/default.template
197
+ doc/js/jsMath/COPYING.txt
198
+ doc/js/jsMath/blank.gif
199
+ doc/js/jsMath/easy/load.js
200
+ doc/js/jsMath/extensions/AMSmath.js
201
+ doc/js/jsMath/extensions/AMSsymbols.js
202
+ doc/js/jsMath/extensions/HTML.js
203
+ doc/js/jsMath/extensions/autobold.js
204
+ doc/js/jsMath/extensions/bbox.js
205
+ doc/js/jsMath/extensions/boldsymbol.js
206
+ doc/js/jsMath/extensions/double-click.js
207
+ doc/js/jsMath/extensions/eqn-number.js
208
+ doc/js/jsMath/extensions/fbox.js
209
+ doc/js/jsMath/extensions/font.js
210
+ doc/js/jsMath/extensions/leaders.js
211
+ doc/js/jsMath/extensions/mathchoice.js
212
+ doc/js/jsMath/extensions/mimeTeX.js
213
+ doc/js/jsMath/extensions/moreArrows.js
214
+ doc/js/jsMath/extensions/newcommand.js
215
+ doc/js/jsMath/extensions/underset-overset.js
216
+ doc/js/jsMath/extensions/verb.js
217
+ doc/js/jsMath/jsMath-BaKoMa-fonts.js
218
+ doc/js/jsMath/jsMath-autoload.html
219
+ doc/js/jsMath/jsMath-controls.html
220
+ doc/js/jsMath/jsMath-easy-load.js
221
+ doc/js/jsMath/jsMath-fallback-mac-mozilla.js
222
+ doc/js/jsMath/jsMath-fallback-mac-msie.js
223
+ doc/js/jsMath/jsMath-fallback-mac.js
224
+ doc/js/jsMath/jsMath-fallback-pc.js
225
+ doc/js/jsMath/jsMath-fallback-symbols.js
226
+ doc/js/jsMath/jsMath-fallback-unix.js
227
+ doc/js/jsMath/jsMath-global-controls.html
228
+ doc/js/jsMath/jsMath-global.html
229
+ doc/js/jsMath/jsMath-loader-omniweb4.js
230
+ doc/js/jsMath/jsMath-loader-post.html
231
+ doc/js/jsMath/jsMath-loader.html
232
+ doc/js/jsMath/jsMath-msie-mac.js
233
+ doc/js/jsMath/jsMath-old-browsers.js
234
+ doc/js/jsMath/jsMath.js
235
+ doc/js/jsMath/local/macros.js
236
+ doc/js/jsMath/plugins/CHMmode.js
237
+ doc/js/jsMath/plugins/autoload.js
238
+ doc/js/jsMath/plugins/global.js
239
+ doc/js/jsMath/plugins/mimeTeX.js
240
+ doc/js/jsMath/plugins/noCache.js
241
+ doc/js/jsMath/plugins/noGlobal.js
242
+ doc/js/jsMath/plugins/noImageFonts.js
243
+ doc/js/jsMath/plugins/smallFonts.js
244
+ doc/js/jsMath/plugins/spriteImageFonts.js
245
+ doc/js/jsMath/plugins/tex2math.js
246
+ doc/js/jsMath/test/index-images.html
247
+ doc/js/jsMath/test/index.html
248
+ doc/js/jsMath/test/jsMath40.jpg
249
+ doc/js/jsMath/test/sample.html
250
+
251
+ commit 3c8e605c3f64bee57067ecc923b273f95f12ae02
252
+ Author: Thomas Leitner <t_leitner@gmx.at>
253
+ Date: Fri Feb 19 12:11:15 2010 +0100
254
+
255
+ Added syntax support for block/inline LaTeX math
256
+
257
+ doc/syntax.page
258
+ lib/kramdown/converter/html.rb
259
+ lib/kramdown/converter/latex.rb
260
+ lib/kramdown/parser/kramdown.rb
261
+ lib/kramdown/parser/kramdown/escaped_chars.rb
262
+ lib/kramdown/parser/kramdown/math.rb
263
+ test/testcases/block/15_math/normal.html
264
+ test/testcases/block/15_math/normal.text
265
+ test/testcases/span/math/normal.html
266
+ test/testcases/span/math/normal.text
267
+
268
+ commit c0da60ad7b3331100056e6c3d01d1e5ec99f0a27
269
+ Author: Thomas Leitner <t_leitner@gmx.at>
270
+ Date: Thu Feb 18 08:08:16 2010 +0100
271
+
272
+ Fixed bug regarding the inclusion of the same LaTeX packages multiple times
273
+
274
+ data/kramdown/document.latex
275
+ lib/kramdown/converter/latex.rb
276
+
277
+ commit 846c0a5c9d42da5bb22a83b3a46cd20c9eafca44
278
+ Author: Thomas Leitner <t_leitner@gmx.at>
279
+ Date: Thu Feb 18 07:17:07 2010 +0100
280
+
281
+ Added documentation for autolinks
282
+
283
+ doc/news/release_0_6_0.page
284
+ doc/syntax.page
285
+
286
+ commit 21c81f6e98b871caac569ef8d76a7024a35141e6
287
+ Author: Thomas Leitner <t_leitner@gmx.at>
288
+ Date: Wed Feb 17 15:45:31 2010 +0100
289
+
290
+ Bumped version number and added release notes file
291
+
292
+ doc/news/release_0_6_0.page
293
+ lib/kramdown/version.rb
294
+
295
+ commit 339345a78869bb483a7eb70007d868e53eb6e9b9
296
+ Author: Thomas Leitner <t_leitner@gmx.at>
297
+ Date: Wed Feb 17 15:43:43 2010 +0100
298
+
299
+ Fixed problem with email autolinks
300
+
301
+ The used regexps were too relaxed and matched invalid email adresses.
302
+
303
+ lib/kramdown/converter/html.rb
304
+ lib/kramdown/parser/kramdown/autolink.rb
305
+ test/testcases/span/autolinks/url_links.html
306
+ test/testcases/span/autolinks/url_links.text
307
+
308
+ commit abac8ea1b2aebc98a4b46f27d57b366d2f20be86
309
+ Author: Thomas Leitner <t_leitner@gmx.at>
310
+ Date: Mon Feb 15 10:46:56 2010 +0100
311
+
312
+ Added pushing gems to gemcutter
313
+
314
+ Rakefile
315
+
1
316
  commit 53449309c569f774d7d3cd68bcc71d48509a4c7e
2
317
  Author: Thomas Leitner <t_leitner@gmx.at>
3
318
  Date: Mon Feb 15 10:16:18 2010 +0100
data/Rakefile CHANGED
@@ -10,6 +10,7 @@ end
10
10
  begin
11
11
  require 'webgen/webgentask'
12
12
  require 'webgen/page'
13
+ require 'webgen/website'
13
14
  rescue LoadError
14
15
  end
15
16
 
@@ -31,6 +32,7 @@ require 'fileutils'
31
32
  require 'rake/clean'
32
33
  require 'rake/testtask'
33
34
  require 'rake/packagetask'
35
+ require 'erb'
34
36
 
35
37
  $:.unshift('lib')
36
38
  require 'kramdown'
@@ -59,6 +61,8 @@ if defined? Webgen
59
61
  config['sources'] = [['/', "Webgen::Source::FileSystem", 'doc']]
60
62
  config['output'] = ['Webgen::Output::FileSystem', 'htmldoc']
61
63
  config.default_processing_pipeline('Page' => 'erb,tags,kramdown,blocks,fragments')
64
+ config.optionsdisplay.items [], :mandatory => 'default'
65
+ config['contentprocessor.tags.map']['options'] = 'OptionsDisplay'
62
66
  end
63
67
  end
64
68
 
@@ -105,6 +109,8 @@ EOF
105
109
  'bin/*',
106
110
  'benchmark/*',
107
111
  'lib/**/*.rb',
112
+ 'man/man1/kramdown.1',
113
+ 'data/**/*',
108
114
  'doc/**',
109
115
  'test/**/*'
110
116
  ])
@@ -121,6 +127,14 @@ EOF
121
127
  `git log --name-only > ChangeLog`
122
128
  end
123
129
 
130
+ CLOBBER << "man/man1/kramdown.1"
131
+ file 'man/man1/kramdown.1' => ['man/man1/kramdown.1.erb'] do
132
+ puts "Generating kramdown man page"
133
+ File.open('man/man1/kramdown.1', 'w+') do |file|
134
+ file.write(ERB.new(File.read('man/man1/kramdown.1.erb')).result(binding))
135
+ end
136
+ end
137
+
124
138
  Rake::PackageTask.new('kramdown', Kramdown::VERSION) do |pkg|
125
139
  pkg.need_tar = true
126
140
  pkg.need_zip = true
@@ -182,6 +196,8 @@ EOF
182
196
  files = %w[.gem .tgz .zip].collect {|ext| "pkg/kramdown-#{Kramdown::VERSION}" + ext}
183
197
 
184
198
  rf.add_release('kramdown', 'kramdown', Kramdown::VERSION, *files)
199
+
200
+ sh "gem push pkg/kramdown-#{Kramdown::VERSION}.gem"
185
201
  puts 'done'
186
202
  end
187
203
 
@@ -256,6 +272,25 @@ task :clobber => ['dev:clobber']
256
272
 
257
273
  # Helper methods and misc ###################################################################
258
274
 
275
+
276
+ class OptionsDisplay
277
+
278
+ include Webgen::Tag::Base
279
+
280
+ def call(tag, body, context)
281
+ param('optionsdisplay.items').collect do |opt|
282
+ Kramdown::Options.definitions[opt]
283
+ end.collect do |term|
284
+ lines = term.desc.split(/\n/)
285
+ first = lines.shift
286
+ rest = lines[0..-2].collect {|l| " " + l}.join("\n")
287
+ "`#{term.name.inspect}`\n: #{first}\n#{rest}"
288
+ end.join("\n")
289
+ end
290
+
291
+ end
292
+
293
+
259
294
  module Kramdown
260
295
 
261
296
  class Parser::Kramdown::Extension
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.5.0
1
+ 0.6.0
@@ -87,22 +87,24 @@ if options[:graph]
87
87
  Dir['historic-*.dat'].each do |historic_name|
88
88
  theruby = historic_name.sub(/^historic-/, '').sub(/\.dat$/, '')
89
89
  graph_name = "graph-#{theruby}.png"
90
- static_name = "static-#{theruby}.dat"
90
+ #static_name = "static-#{theruby}.dat"
91
91
  historic_names = File.readlines(historic_name).first.chomp[1..-1].split(/\s*\|\|\s*/)
92
- static_names = (File.exist?(static_name) ? File.readlines(static_name).first.chomp[1..-1].split(/\s*\|\|\s*/) : [])
92
+ #static_names = (File.exist?(static_name) ? File.readlines(static_name).first.chomp[1..-1].split(/\s*\|\|\s*/) : [])
93
93
  File.open("gnuplot.dat", "w+") do |f|
94
94
  f.puts <<EOF
95
95
  set title "Execution Time Performance for #{theruby}"
96
96
  set xlabel "File Multiplier (i.e. n times mdbasic.text)"
97
97
  set ylabel "Execution Time in secondes"
98
+ set key left top
98
99
  set grid "on"
99
100
  set terminal png
100
101
  set output "#{graph_name}"
101
102
  EOF
102
103
  f.print "plot "
103
104
  i, j = 1, 1
104
- f.puts((historic_names.map {|n| i += 1; "\"#{historic_name}\" using 1:#{i} with lp title \"#{n}\""} +
105
- static_names.map {|n| j += 1; n =~ /bluefeather/i ? nil : "\"#{static_name}\" using 1:#{j} with lp title \"#{n}\""}.compact).join(", "))
105
+ f.puts((historic_names.map {|n| i += 1; "\"#{historic_name}\" using 1:#{i} with lp title \"#{n}\""}
106
+ #static_names.map {|n| j += 1; n =~ /bluefeather/i ? nil : "\"#{static_name}\" using 1:#{j} with lp title \"#{n}\""}.compact
107
+ ).join(", "))
106
108
  end
107
109
  `gnuplot gnuplot.dat`
108
110
  FileUtils.rm("gnuplot.dat")
@@ -1,7 +1,7 @@
1
- # kramdown 0.1.0 || kramdown 0.2.0 || kramdown 2009-03-10 || kramdown 2009-11-05 || kramdown 0.3.0 || kramdown 0.4.0 || kramdown 0.5.0
2
- 1 0.21300 0.31800 0.20500 0.24800 0.16800 0.30400 0.30800
3
- 2 0.20700 0.22600 0.27200 0.22900 0.26700 0.23400 0.26800
4
- 4 0.22000 0.21700 0.21600 0.19600 0.20400 0.19300 0.19400
5
- 8 0.36300 0.44500 0.39300 0.34300 0.30100 0.29500 0.32800
6
- 16 0.45400 0.53400 1.01400 0.41100 0.46200 0.48900 0.50200
7
- 32 1.02800 0.98100 1.70100 0.84600 0.84600 0.81900 0.72200
1
+ # kramdown 0.1.0 || kramdown 0.2.0 || kramdown 0.3.0 || kramdown 0.4.0 || kramdown 0.5.0 || kramdown 0.6.0
2
+ 1 0.21300 0.31800 0.16800 0.30400 0.30800 0.17300
3
+ 2 0.20700 0.22600 0.26700 0.23400 0.26800 0.39000
4
+ 4 0.22000 0.21700 0.20400 0.19300 0.19400 0.19300
5
+ 8 0.36300 0.44500 0.30100 0.29500 0.32800 0.31900
6
+ 16 0.45400 0.53400 0.46200 0.48900 0.50200 0.51000
7
+ 32 1.02800 0.98100 0.84600 0.81900 0.72200 0.68500