review 1.4.0 → 1.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (87) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -1
  3. data/.travis.yml +1 -0
  4. data/ChangeLog +87 -0
  5. data/bin/review-check +2 -2
  6. data/bin/review-compile +15 -30
  7. data/bin/review-index +1 -1
  8. data/bin/review-init +12 -7
  9. data/bin/review-vol +9 -1
  10. data/doc/catalog.ja.md +53 -0
  11. data/doc/catalog.md +52 -0
  12. data/doc/format.ja.md +734 -0
  13. data/doc/format.md +746 -0
  14. data/doc/format_idg.ja.md +203 -0
  15. data/doc/{quickstart.rdoc → quickstart.ja.md} +138 -104
  16. data/doc/quickstart.md +252 -0
  17. data/doc/sample.yml +216 -48
  18. data/lib/epubmaker.rb +0 -1
  19. data/lib/epubmaker/content.rb +2 -2
  20. data/lib/epubmaker/epubcommon.rb +440 -0
  21. data/lib/epubmaker/epubv2.rb +8 -418
  22. data/lib/epubmaker/epubv3.rb +67 -61
  23. data/lib/epubmaker/producer.rb +60 -19
  24. data/lib/review/book.rb +1 -3
  25. data/lib/review/book/base.rb +18 -11
  26. data/lib/review/book/chapter.rb +5 -24
  27. data/lib/review/book/compilable.rb +5 -1
  28. data/lib/review/book/index.rb +48 -17
  29. data/lib/review/book/page_metric.rb +17 -8
  30. data/lib/review/book/part.rb +12 -2
  31. data/lib/review/book/volume.rb +3 -2
  32. data/lib/review/builder.rb +30 -10
  33. data/lib/review/compiler.rb +6 -4
  34. data/lib/review/configure.rb +3 -3
  35. data/lib/review/epubmaker.rb +56 -26
  36. data/lib/review/htmlbuilder.rb +33 -42
  37. data/lib/review/htmlutils.rb +12 -7
  38. data/lib/review/i18n.rb +77 -17
  39. data/lib/review/i18n.yml +80 -4
  40. data/lib/review/idgxmlbuilder.rb +27 -57
  41. data/lib/review/inaobuilder.rb +3 -3
  42. data/lib/review/latexbuilder.rb +90 -67
  43. data/lib/review/layout.tex.erb +54 -7
  44. data/lib/review/markdownbuilder.rb +21 -3
  45. data/lib/review/pdfmaker.rb +67 -38
  46. data/lib/review/sec_counter.rb +1 -1
  47. data/lib/review/tocparser.rb +9 -5
  48. data/lib/review/topbuilder.rb +6 -6
  49. data/lib/review/version.rb +1 -1
  50. data/review.gemspec +3 -1
  51. data/test/book_test_helper.rb +1 -1
  52. data/test/sample-book/README.md +2 -0
  53. data/test/sample-book/src/Rakefile +31 -0
  54. data/test/sample-book/src/_cover.html +0 -0
  55. data/test/sample-book/src/catalog.yml +10 -0
  56. data/test/sample-book/src/ch01.re +0 -0
  57. data/test/sample-book/src/ch02.re +0 -0
  58. data/test/sample-book/src/config.yml +160 -32
  59. data/test/sample-book/src/images/ch01-imgsample.jpg +0 -0
  60. data/test/sample-book/src/images/cover.jpg +0 -0
  61. data/test/sample-book/src/preface.re +0 -0
  62. data/test/sample-book/src/sty/jumoline.sty +0 -0
  63. data/test/sample-book/src/sty/reviewmacro.sty +18 -0
  64. data/test/sample-book/src/style.css +0 -0
  65. data/test/test_book.rb +25 -27
  66. data/test/test_book_chapter.rb +4 -73
  67. data/test/test_book_part.rb +5 -4
  68. data/test/test_builder.rb +3 -3
  69. data/test/test_epub3maker.rb +527 -0
  70. data/test/test_epubmaker.rb +6 -6
  71. data/test/test_htmlbuilder.rb +143 -6
  72. data/test/test_i18n.rb +95 -10
  73. data/test/test_idgxmlbuilder.rb +28 -2
  74. data/test/test_index.rb +109 -1
  75. data/test/test_latexbuilder.rb +51 -0
  76. data/test/test_markdownbuilder.rb +54 -1
  77. data/test/test_pdfmaker.rb +7 -6
  78. data/test/test_review_ext.rb +31 -0
  79. data/test/test_topbuilder.rb +3 -1
  80. metadata +46 -13
  81. data/doc/catalog.rdoc +0 -49
  82. data/doc/format.rdoc +0 -618
  83. data/doc/format_idg.rdoc +0 -180
  84. data/doc/libepubmaker/config.yml +0 -207
  85. data/lib/epubmaker/resource.rb +0 -82
  86. data/test/sample-book/src/CHAPS +0 -2
  87. data/test/sample-book/src/PREDEF +0 -1
data/lib/epubmaker.rb CHANGED
@@ -19,7 +19,6 @@
19
19
  # epub.produce
20
20
 
21
21
  require 'epubmaker/producer'
22
- require 'epubmaker/resource'
23
22
  require 'epubmaker/content'
24
23
  require 'epubmaker/epubv2'
25
24
  require 'epubmaker/epubv3'
@@ -64,8 +64,8 @@ module EPUBMaker
64
64
  if self.class != obj.class
65
65
  return false
66
66
  end
67
- [self.id, self.file, self.media, self.title, self.level, self.notoc] ==
68
- [obj.id, obj.file, obj.media, obj.title, obj.level, obj.notoc]
67
+ [self.id, self.file, self.media, self.title, self.level, self.notoc, self.chaptype, self.properties] ==
68
+ [obj.id, obj.file, obj.media, obj.title, obj.level, obj.notoc, obj.chaptype, obj.properties]
69
69
  end
70
70
 
71
71
  private
@@ -0,0 +1,440 @@
1
+ # encoding: utf-8
2
+ # = epubcommon.rb -- super class for EPUBv2 and EPUBv3
3
+ #
4
+ # Copyright (c) 2010-2014 Kenshi Muto and Masayoshi Takahashi
5
+ #
6
+ # This program is free software.
7
+ # You can distribute or modify this program under the terms of
8
+ # the GNU LGPL, Lesser General Public License version 2.1.
9
+ # For details of the GNU LGPL, see the file "COPYING".
10
+ #
11
+
12
+ require 'epubmaker/producer'
13
+ require 'review/i18n'
14
+ require 'cgi'
15
+
16
+ module EPUBMaker
17
+
18
+ # EPUBCommon is the common class for EPUB producer.
19
+ class EPUBCommon
20
+ # Construct object with parameter hash +params+ and message resource hash +res+.
21
+ def initialize(producer)
22
+ @producer = producer
23
+ end
24
+
25
+ # Return mimetype content.
26
+ def mimetype
27
+ "application/epub+zip"
28
+ end
29
+
30
+ def opf_coverimage
31
+ s = ""
32
+ if @producer.params["coverimage"]
33
+ file = nil
34
+ @producer.contents.each do |item|
35
+ if item.media =~ /\Aimage/ && item.file =~ /#{@producer.params["coverimage"]}\Z/
36
+ s << %Q[ <meta name="cover" content="#{item.id}"/>\n]
37
+ file = item.file
38
+ break
39
+ end
40
+ end
41
+ raise "coverimage #{@producer.params["coverimage"]} not found. Abort." if file.nil?
42
+ end
43
+ s
44
+ end
45
+
46
+ def ncx_isbn
47
+ if @producer.params["isbn"].nil?
48
+ %Q[ <meta name="dtb:uid" content="#{@producer.params["urnid"]}"/>\n]
49
+ else
50
+ %Q[ <meta name="dtb:uid" content="#{@producer.params["isbn"]}"/>\n]
51
+ end
52
+ end
53
+
54
+ def ncx_doctitle
55
+ <<EOT
56
+ <docTitle>
57
+ <text>#{CGI.escapeHTML(@producer.params["title"])}</text>
58
+ </docTitle>
59
+ <docAuthor>
60
+ <text>#{@producer.params["aut"].nil? ? "" : CGI.escapeHTML(@producer.params["aut"].join(", "))}</text>
61
+ </docAuthor>
62
+ EOT
63
+ end
64
+
65
+ def ncx_navmap(indentarray)
66
+ s = <<EOT
67
+ <navMap>
68
+ <navPoint id="top" playOrder="1">
69
+ <navLabel>
70
+ <text>#{CGI.escapeHTML(@producer.params["title"])}</text>
71
+ </navLabel>
72
+ <content src="#{@producer.params["cover"]}"/>
73
+ </navPoint>
74
+ EOT
75
+
76
+ nav_count = 2
77
+
78
+ unless @producer.params["mytoc"].nil?
79
+ s << <<EOT
80
+ <navPoint id="toc" playOrder="#{nav_count}">
81
+ <navLabel>
82
+ <text>#{@producer.res.v("toctitle")}</text>
83
+ </navLabel>
84
+ <content src="#{@producer.params["bookname"]}-toc.#{@producer.params["htmlext"]}"/>
85
+ </navPoint>
86
+ EOT
87
+ nav_count += 1
88
+ end
89
+
90
+ @producer.contents.each do |item|
91
+ next if item.title.nil?
92
+ indent = indentarray.nil? ? [""] : indentarray
93
+ level = item.level.nil? ? 0 : (item.level - 1)
94
+ level = indent.size - 1 if level >= indent.size
95
+ s << <<EOT
96
+ <navPoint id="nav-#{nav_count}" playOrder="#{nav_count}">
97
+ <navLabel>
98
+ <text>#{indent[level]}#{CGI.escapeHTML(item.title)}</text>
99
+ </navLabel>
100
+ <content src="#{item.file}"/>
101
+ </navPoint>
102
+ EOT
103
+ nav_count += 1
104
+ end
105
+
106
+ s << <<EOT
107
+ </navMap>
108
+ EOT
109
+ s
110
+ end
111
+
112
+ # Return container content.
113
+ def container
114
+ s = <<EOT
115
+ <?xml version="1.0" encoding="UTF-8"?>
116
+ <container xmlns="urn:oasis:names:tc:opendocument:xmlns:container" version="1.0">
117
+ <rootfiles>
118
+ <rootfile full-path="OEBPS/#{@producer.params["bookname"]}.opf" media-type="application/oebps-package+xml" />
119
+ </rootfiles>
120
+ </container>
121
+ EOT
122
+ s
123
+ end
124
+
125
+ # Return cover content.
126
+ def cover(type=nil)
127
+ bodyext = type.nil? ? "" : " epub:type=\"#{type}\""
128
+
129
+ s = common_header
130
+ s << <<EOT
131
+ <title>#{CGI.escapeHTML(@producer.params["title"])}</title>
132
+ </head>
133
+ <body#{bodyext}>
134
+ EOT
135
+ if @producer.params["coverimage"].nil?
136
+ s << <<EOT
137
+ <h1 class="cover-title">#{CGI.escapeHTML(@producer.params["title"])}</h1>
138
+ EOT
139
+ else
140
+ file = nil
141
+ @producer.contents.each do |item|
142
+ if item.media =~ /\Aimage/ && item.file =~ /#{@producer.params["coverimage"]}\Z/ # /
143
+ file = item.file
144
+ break
145
+ end
146
+ end
147
+ raise "coverimage #{@producer.params["coverimage"]} not found. Abort." if file.nil?
148
+ s << <<EOT
149
+ <div id="cover-image" class="cover-image">
150
+ <img src="#{file}" alt="#{CGI.escapeHTML(@producer.params["title"])}" class="max"/>
151
+ </div>
152
+ EOT
153
+ end
154
+
155
+ s << <<EOT
156
+ </body>
157
+ </html>
158
+ EOT
159
+ s
160
+ end
161
+
162
+ # Return title (copying) content.
163
+ def titlepage
164
+ s = common_header
165
+ s << <<EOT
166
+ <title>#{CGI.escapeHTML(@producer.params["title"])}</title>
167
+ </head>
168
+ <body>
169
+ <h1 class="tp-title">#{CGI.escapeHTML(@producer.params["title"])}</h1>
170
+ EOT
171
+
172
+ if @producer.params["aut"]
173
+ s << <<EOT
174
+ <p>
175
+ <br />
176
+ <br />
177
+ </p>
178
+ <h2 class="tp-author">#{CGI.escapeHTML(@producer.params["aut"].join(", "))}</h2>
179
+ EOT
180
+ end
181
+
182
+ publisher = @producer.params["pbl"] || @producer.params["prt"] # XXX Backward Compatiblity
183
+ if publisher
184
+ s << <<EOT
185
+ <p>
186
+ <br />
187
+ <br />
188
+ <br />
189
+ <br />
190
+ </p>
191
+ <h3 class="tp-publisher">#{CGI.escapeHTML(publisher.join(", "))}</h3>
192
+ EOT
193
+ end
194
+
195
+ s << <<EOT
196
+ </body>
197
+ </html>
198
+ EOT
199
+
200
+ s
201
+ end
202
+
203
+ # Return colophon content.
204
+ def colophon
205
+ s = common_header
206
+ s << <<EOT
207
+ <title>#{@producer.res.v("colophontitle")}</title>
208
+ </head>
209
+ <body>
210
+ <div class="colophon">
211
+ EOT
212
+
213
+ if @producer.params["subtitle"].nil?
214
+ s << <<EOT
215
+ <p class="title">#{CGI.escapeHTML(@producer.params["title"])}</p>
216
+ EOT
217
+ else
218
+ s << <<EOT
219
+ <p class="title">#{CGI.escapeHTML(@producer.params["title"])}<br /><span class="subtitle">#{CGI.escapeHTML(@producer.params["subtitle"])}</span></p>
220
+ EOT
221
+ end
222
+
223
+ if @producer.params["date"] || @producer.params["history"]
224
+ s << %Q[ <div class="pubhistory">\n]
225
+ if @producer.params["history"]
226
+ @producer.params["history"].each_with_index do |items, edit|
227
+ items.each_with_index do |item, rev|
228
+ editstr = (edit == 0) ? ReVIEW::I18n.t("first_edition") : ReVIEW::I18n.t("nth_edition","#{edit+1}")
229
+ revstr = ReVIEW::I18n.t("nth_impression", "#{rev+1}")
230
+ if item =~ /\A\d+\-\d+\-\d+\Z/
231
+ s << %Q[ <p>#{ReVIEW::I18n.t("published_by1", [date_to_s(item), editstr+revstr])}</p>\n]
232
+ else
233
+ # custom date with string
234
+ item.match(/\A(\d+\-\d+\-\d+)[\s ](.+)/) do |m|
235
+ s << %Q[ <p>#{ReVIEW::I18n.t("published_by3", [date_to_s(m[1]), m[2]])}</p>\n]
236
+ end
237
+ end
238
+ end
239
+ end
240
+ else
241
+ s << %Q[ <p>#{ReVIEW::I18n.t("published_by2", date_to_s(@producer.params["date"]))}</p>\n]
242
+ end
243
+ s << %Q[ </div>\n]
244
+ end
245
+
246
+ s << %Q[ <table class="colophon">\n]
247
+ s << %Q[ <tr><th>#{@producer.res.v("aut")}</th><td>#{CGI.escapeHTML(@producer.params["aut"].join(", "))}</td></tr>\n] unless @producer.params["aut"].nil?
248
+ s << %Q[ <tr><th>#{@producer.res.v("csl")}</th><td>#{CGI.escapeHTML(@producer.params["csl"].join(", "))}</td></tr>\n] unless @producer.params["csl"].nil?
249
+ s << %Q[ <tr><th>#{@producer.res.v("trl")}</th><td>#{CGI.escapeHTML(@producer.params["trl"].join(", "))}</td></tr>\n] unless @producer.params["trl"].nil?
250
+ s << %Q[ <tr><th>#{@producer.res.v("dsr")}</th><td>#{CGI.escapeHTML(@producer.params["dsr"].join(", "))}</td></tr>\n] unless @producer.params["dsr"].nil?
251
+ s << %Q[ <tr><th>#{@producer.res.v("ill")}</th><td>#{CGI.escapeHTML(@producer.params["ill"].join(", "))}</td></tr>\n] unless @producer.params["ill"].nil?
252
+ s << %Q[ <tr><th>#{@producer.res.v("edt")}</th><td>#{CGI.escapeHTML(@producer.params["edt"].join(", "))}</td></tr>\n] unless @producer.params["edt"].nil?
253
+ s << %Q[ <tr><th>#{@producer.res.v("pbl")}</th><td>#{CGI.escapeHTML(@producer.params["pbl"].join(", "))}</td></tr>\n] unless @producer.params["pbl"].nil?
254
+ s << %Q[ <tr><th>#{@producer.res.v("prt")}</th><td>#{CGI.escapeHTML(@producer.params["prt"].join(", "))}</td></tr>\n] unless @producer.params["prt"].nil?
255
+ s << %Q[ <tr><th>#{@producer.res.v("pht")}</th><td>#{CGI.escapeHTML(@producer.params["pht"].join(", "))}</td></tr>\n] unless @producer.params["pht"].nil?
256
+ if @producer.params["isbn"].to_s =~ /\A\d{10}\Z/ || @producer.params["isbn"].to_s =~ /\A\d{13}\Z/
257
+ isbn = nil
258
+ str = @producer.params["isbn"].to_s
259
+ if str.size == 10
260
+ isbn = "#{str[0..0]}-#{str[1..5]}-#{str[6..8]}-#{str[9..9]}"
261
+ else
262
+ isbn = "#{str[0..2]}-#{str[3..3]}-#{str[4..8]}-#{str[9..11]}-#{str[12..12]}"
263
+ end
264
+ s << %Q[ <tr><th>ISBN</th><td>#{isbn}</td></tr>\n]
265
+ end
266
+ s << <<EOT
267
+ </table>
268
+ EOT
269
+ if !@producer.params["rights"].nil? && @producer.params["rights"].size > 0
270
+ s << %Q[ <p class="copyright">#{@producer.params["rights"].join("<br />")}</p>]
271
+ end
272
+
273
+ s << <<EOT
274
+ </div>
275
+ </body>
276
+ </html>
277
+ EOT
278
+ s
279
+ end
280
+
281
+ def date_to_s(date)
282
+ require 'date'
283
+ d = Date.parse(date)
284
+ d.strftime(ReVIEW::I18n.t("date_format"))
285
+ end
286
+
287
+ # Return own toc content.
288
+ def mytoc
289
+ s = common_header
290
+ s << <<EOT
291
+ <title>#{@producer.res.v("toctitle")}</title>
292
+ </head>
293
+ <body>
294
+ <h1 class="toc-title">#{@producer.res.v("toctitle")}</h1>
295
+ EOT
296
+
297
+ if @producer.params["epubmaker"]["flattoc"].nil?
298
+ s << hierarchy_ncx("ul")
299
+ else
300
+ s << flat_ncx("ul", @producer.params["epubmaker"]["flattocindent"])
301
+ end
302
+
303
+ s << <<EOT
304
+ </body>
305
+ </html>
306
+ EOT
307
+ s
308
+ end
309
+
310
+ def hierarchy_ncx(type)
311
+ require 'rexml/document'
312
+ level = 1
313
+ find_jump = nil
314
+ has_part = nil
315
+ toclevel = @producer.params["toclevel"].to_i
316
+
317
+ # check part existance
318
+ @producer.contents.each do |item|
319
+ if item.notoc.nil? && item.chaptype == "part"
320
+ has_part = true
321
+ break
322
+ end
323
+ end
324
+
325
+ if !has_part.nil?
326
+ @producer.contents.each do |item|
327
+ item.level += 1 if item.chaptype == "part" || item.chaptype == "body"
328
+ item.notoc = true if (item.chaptype == "pre" || item.chaptype == "post") && !item.level.nil? && (item.level + 1 == toclevel) # FIXME: 部があるときに前後の処理が困難
329
+ end
330
+ toclevel += 1
331
+ end
332
+
333
+ doc = REXML::Document.new(%Q[<#{type} class="toc-h#{level}"><li /></#{type}>])
334
+ doc.context[:attribute_quote] = :quote
335
+
336
+ e = doc.root.elements[1] # first <li/>
337
+ @producer.contents.each do |item|
338
+ next if !item.notoc.nil? || item.level.nil? || item.file.nil? || item.title.nil? || item.level > toclevel
339
+
340
+ if item.level == level
341
+ e2 = e.parent.add_element("li")
342
+ e = e2
343
+ elsif item.level > level
344
+ find_jump = true if (item.level - level) > 1
345
+ # deeper
346
+ (level + 1).upto(item.level) do |n|
347
+ if e.size == 0
348
+ # empty span for epubcheck
349
+ e.attributes["style"] = "list-style-type: none;"
350
+ es = e.add_element("span", {"style"=>"display:none;"})
351
+ es.add_text(REXML::Text.new("&#xa0;", false, nil, true))
352
+ end
353
+
354
+ e2 = e.add_element(type, {"class" => "toc-h#{n}"})
355
+ e3 = e2.add_element("li")
356
+ e = e3
357
+ end
358
+ level = item.level
359
+ elsif item.level < level
360
+ # shallower
361
+ (level - 1).downto(item.level) do |n|
362
+ e = e.parent.parent
363
+ end
364
+ e2 = e.parent.add_element("li")
365
+ e = e2
366
+ level = item.level
367
+ end
368
+ e2 = e.add_element("a", {"href" => item.file})
369
+ e2.add_text(REXML::Text.new(item.title, true))
370
+ end
371
+
372
+ warn "found level jumping in table of contents. consider to use 'epubmaker:flattoc: true' for strict ePUB validator." unless find_jump.nil?
373
+
374
+ doc.to_s.gsub("<li/>", "").gsub("</li>", "</li>\n").gsub("<#{type} ", "\n" + '\&') # ugly
375
+ end
376
+
377
+ def flat_ncx(type, indent=nil)
378
+ s = %Q[<#{type} class="toc-h1">\n]
379
+ @producer.contents.each do |item|
380
+ next if !item.notoc.nil? || item.level.nil? || item.file.nil? || item.title.nil? || item.level > @producer.params["toclevel"].to_i
381
+ is = indent == true ? " " * item.level : ""
382
+ s << %Q[<li><a href="#{item.file}">#{is}#{CGI.escapeHTML(item.title)}</a></li>\n]
383
+ end
384
+ s << %Q[</#{type}>\n]
385
+
386
+ s
387
+ end
388
+
389
+ def produce_write_common(basedir, tmpdir)
390
+ File.open("#{tmpdir}/mimetype", "w") {|f| @producer.mimetype(f) }
391
+
392
+ Dir.mkdir("#{tmpdir}/META-INF") unless File.exist?("#{tmpdir}/META-INF")
393
+ File.open("#{tmpdir}/META-INF/container.xml", "w") {|f| @producer.container(f) }
394
+
395
+ Dir.mkdir("#{tmpdir}/OEBPS") unless File.exist?("#{tmpdir}/OEBPS")
396
+ File.open("#{tmpdir}/OEBPS/#{@producer.params["bookname"]}.opf", "w") {|f| @producer.opf(f) }
397
+
398
+ if File.exist?("#{basedir}/#{@producer.params["cover"]}")
399
+ FileUtils.cp("#{basedir}/#{@producer.params["cover"]}", "#{tmpdir}/OEBPS")
400
+ else
401
+ File.open("#{tmpdir}/OEBPS/#{@producer.params["cover"]}", "w") {|f| @producer.cover(f) }
402
+ end
403
+
404
+ @producer.contents.each do |item|
405
+ next if item.file =~ /#/ # skip subgroup
406
+ fname = "#{basedir}/#{item.file}"
407
+ raise "#{fname} doesn't exist. Abort." unless File.exist?(fname)
408
+ FileUtils.mkdir_p(File.dirname("#{tmpdir}/OEBPS/#{item.file}")) unless File.exist?(File.dirname("#{tmpdir}/OEBPS/#{item.file}"))
409
+ FileUtils.cp(fname, "#{tmpdir}/OEBPS/#{item.file}")
410
+ end
411
+ end
412
+
413
+ def export_zip(tmpdir, epubfile)
414
+ Dir.chdir(tmpdir) {|d| `#{@producer.params["epubmaker"]["zip_stage1"]} #{epubfile} mimetype` }
415
+ Dir.chdir(tmpdir) {|d| `#{@producer.params["epubmaker"]["zip_stage2"]} #{epubfile} META-INF OEBPS #{@producer.params["epubmaker"]["zip_addpath"]}` }
416
+ end
417
+
418
+ def legacy_cover_and_title_file(loadfile, writefile)
419
+ s = common_header
420
+ s << <<EOT
421
+ <title>#{@producer.params["booktitle"]}</title>
422
+ </head>
423
+ <body>
424
+ EOT
425
+ File.open(loadfile) do |f|
426
+ f.each_line do |l|
427
+ s << l
428
+ end
429
+ end
430
+ s << <<EOT
431
+ </body>
432
+ </html>
433
+ EOT
434
+
435
+ File.open(writefile, "w") do |f|
436
+ f.puts s
437
+ end
438
+ end
439
+ end
440
+ end