bookish.rb in livetext-0.9.15

- old
+ new

@@ -1,23 +1,25 @@
-def hardbreaks
+def hardbreaks(args = nil, body = nil)
   @hard = false
   @hard = true unless @_args.first == "off"
 end
 
 def hardbreaks?
   @hard
 end
 
-def credit
+def credit(args = nil, body = nil)
   # really just a place marker in source
 end
 
+# These are duplicated. Remove safely
+
 def h1; _out "<h1>#{@_data}</h1>"; end
 def h2; _out "<h2>#{@_data}</h2>"; end
 def h3; _out "<h3>#{@_data}</h3>"; end
 
-def alpha_columns
+def alpha_columns(args = nil, body = nil)
   n = @_args.first.to_i   # FIXME: what if missing?
   words = []
   _body do |line| 
     words << line.chomp
   end
@@ -28,13 +30,13 @@
     _out "<tr><td width=5% valign=top></td><td>" + items.join("</td><td>") + "</td></tr>"
   end
   _out "</table>"
 end
 
-def comment
-  _body { }  # ignore body
-end
+# def comment
+#   _body { }  # ignore body
+# end
 
 def _errout(*args)
   ::STDERR.puts *args
 end
 
@@ -46,25 +48,27 @@
   s2 = str.chomp.strip.gsub(/[?:,()'"\/]/,"").gsub(/ /, "-").downcase
 # _errout "SLUG: #{str} => #{s2}"
   s2
 end
 
-def image
+
+# FIXME duplicated?
+def image(args = nil, body = nil)
   name = @_args[0]
   _out "<img src='#{name}'></img>"
 end
 
-def figure
+def figure(args = nil, body = nil)
   name = @_args[0]
   num = @_args[1]
   title = @_args[2..-1].join(" ")
   title = _format(title)
   _out "<img src='#{name}'></img>"
   _out "<center><b>Figure #{num}</b> #{title}</center>"
 end
 
-def chapter
+def chapter(args = nil, body = nil)
 # _errout("chapter")
   @chapter = @_args.first.to_i
   @sec = @sec2 = 0
   title = @_data.split(" ",2)[1]
   @toc << "<br><b>#@chapter</b> #{title}<br>"
@@ -76,11 +80,11 @@
     <h1>#{title}</h1>
 
   HTML
 end
 
-def chapterN
+def chapterN(args = nil, body = nil)
   @chapter += 1
   @sec = @sec2 = 0
   title = @_data    # .split(" ",2)[1]
   _errout("Chapter #@chapter: #{title}")
   @toc << "<br><b>#@chapter</b> #{title}<br>"
@@ -92,11 +96,11 @@
     <h1>#{title}</h1>
 
   HTML
 end
 
-def sec
+def sec(args = nil, body = nil)
   @sec += 1
   @sec2 = 0
   @section = "#@chapter.#@sec"
   title = @_data.dup
   @toc << "#{_nbsp(3)}<b>#@section</b> #{title}<br>"
@@ -106,21 +110,21 @@
 rescue => err
   STDERR.puts "#{err}\n#{err.backtrace}"
   exit
 end
 
-def subsec
+def subsec(args = nil, body = nil)
   @sec2 += 1
   @subsec = "#@chapter.#@sec.#@sec2"
   title = @_data.dup
   @toc << "#{_nbsp(6)}<b>#@subsec</b> #{title}<br>"
   @_data = _slug(@_data)
   next_output
   _out "<h3>#@subsec #{title}</h3>\n"
 end
 
-def definition_table
+def definition_table(args = nil, body = nil)
   title = @_data
   wide = "95"
   delim = " :: "
   _out "<br><center><table width=#{wide}% cellpadding=5>"
   lines = _body(true)
@@ -138,11 +142,11 @@
   _out "</table></center><br><br>"
 
   _optional_blank_line
 end
 
-def table2
+def table2(args = nil, body = nil)
   title = @_data
   wide = "90"
   extra = _args[2]
   delim = " :: "
   _out "<br><center><table width=#{wide}% cellpadding=5>"
@@ -162,11 +166,11 @@
   _out "</table></center><br><br>"
 
   _optional_blank_line
 end
 
-def simple_table
+def simple_table(args = nil, body = nil)
   title = @_data
   delim = " :: "
   _out "<table cellpadding=2>"
   lines = _body(true)
   maxw = nil
@@ -191,11 +195,11 @@
     _out "</tr>"
   end
   _out "</table>"
 end
 
-def table
+def table(args = nil, body = nil)
   @table_num ||= 0
   @table_num += 1
   title = @_data
   delim = " :: "
   _out "<br><center><table width=90% cellpadding=5>"
@@ -225,20 +229,20 @@
   @toc << "#{_nbsp(8)}<b>Table #@chapter.#@table_num</b> #{title}<br>"
 # _next_output(_slug("table_#{title}"))
   _out "<b>Table #@chapter.#@table_num &nbsp;&nbsp; #{title}</b></center><br>"
 end
 
-def toc!
+def toc!(args = nil, body = nil)
   _debug "Closing TOC"
   @toc.close
 rescue => err
    puts @parent.body
    @parent.body = ""
   _errout "Exception: #{err.inspect}"
 end
 
-def toc2
+def toc2(args = nil, body = nil)
   file = @_args[0]
   @toc.close
   ::File.write(file, <<-EOS)
 <p style="page-break-after:always;"></p>
 <meta charset='UTF-8'>
@@ -247,27 +251,27 @@
 
 EOS
   system("cat toc.tmp >>#{file}")
 end
 
-def missing
+def missing(args = nil, body = nil)
   @toc << "#{_nbsp(8)}<font color=red>TBD: #@_data</font><br>"
   stuff = @_data.empty? ? "" : ": #@_data"
   _out "<br><font color=red><i>[Material missing#{stuff}]</i></font><br>\n "
 end
 
-def TBC
+def TBC(args = nil, body = nil)
   @toc << "#{_nbsp(8)}<font color=red>To be continued...</font><br>"
   _out "<br><font color=red><i>To be continued...</i></font><br>"
 end
 
-def note
+def note(args = nil, body = nil)
   _out "<br><font color=red><i>Note: "
   _out @_data 
   _out "</i></font><br>\n "
 end
 
-def quote
+def quote(args = nil, body = nil)
   _out "<blockquote>"
   _body {|line| _out line }
   _out "</blockquote>"
 rescue => err
   STDERR.puts "#{err}\n#{err.backtrace}"