rttool 1.0.2.0 → 1.0.3.0

data/bin/rdrt2

@@ -0,0 +1,2 @@
+#!/usr/bin/env ruby
+exec "rd2", "-r", "rd/rt-filter", "--with-part=RT:rt", *ARGV

data/bin/rt/rt2

@@ -2,7 +2,7 @@
 =begin
 = NAME
 rt2 - converter from RT to other mark-up language.
-$Id: rt2 597 2005-10-18 21:03:12Z rubikitch $
+$Id: rt2 1532 2009-01-24 16:04:36Z rubikitch $
 = SYNOPSIS
   rt2 [-r <visitor>] [options] <file>
 
@@ -61,6 +61,7 @@ $RC = {}
 # initialize OptionParser
 ARGV.options = OptionParser.new("Usage: #{$0} [options] rt-file > output\n") do
   |q|
+  q.version = "1.0.3"
   q.on_head("global options:")
   
   q.on("-rLIB", "--require=LIB",

data/bin/rt2

@@ -0,0 +1,163 @@
+#! /usr/bin/env ruby
+=begin
+= NAME
+rt2 - converter from RT to other mark-up language.
+$Id: rt2 1532 2009-01-24 16:04:36Z rubikitch $
+= SYNOPSIS
+  rt2 [-r <visitor>] [options] <file>
+
+= DESCRIPTION
+rt2 inputs from ((|<file>|)) and outputs in (({STDOUT})). you can
+choose ((|<visitor>|)) to select output format. For example, use
+"rt/rt2html-lib.rb" to turn it into HTML.
+
+= OPTIONS
+please check the output of 
+  % rt2 --help
+and
+  % rt2 -r rt/rt2html-lib.rb --help
+
+= FILES
+  * ~/.rt2rc - User configuration file.
+
+= SEE ALSO
+ruby(1)
+=end
+
+require "kconv"
+require "optparse"
+require "rt/rtparser"
+
+def Kconv.name2const(name)
+  case name
+  when "iso-2022-jp"
+    Kconv::JIS
+  when "euc-jp"
+    Kconv::EUC
+  when "shift_jis"
+    Kconv::SJIS
+  end
+end
+
+include RT
+
+# global vars
+$Visitor = nil
+$RT2_Sub_OptionParser = nil
+
+# local vars
+include_path = []
+with_part = []
+output_file = nil
+output_index = nil
+out_code = nil
+from_rto = nil
+
+# user option
+$DEFAULT_FORMAT_LIB = "rt/rt2txt-lib"
+$RC = {}
+
+
+# initialize OptionParser
+ARGV.options = OptionParser.new("Usage: #{$0} [options] rt-file > output\n") do
+  |q|
+  q.version = "1.0.3"
+  q.on_head("global options:")
+  
+  q.on("-rLIB", "--require=LIB",
+       String,
+       "choose format library.") do |i|
+    # require LIB
+    require i
+    if $Visitor_Class && !$Visitor
+      $Visitor = $Visitor_Class.new()
+      if $RT2_Sub_OptionParser    
+	require $RT2_Sub_OptionParser
+	$RT2_Sub_OptionParser = nil
+      end
+    end
+  end
+  
+  q.on("-oNAME",
+       String,
+       "indicate base name of output file") do |i|
+    output_file = i
+  end
+
+  q.on("--out-code=KCODE",
+       String,
+       "character encoding of output.(jis|euc|sjis)") do |i|
+    case i
+    when /sjis|shift-jis/i
+      out_code = "shift_jis"
+    when /jis|iso-2022-jp/i
+      out_code = "iso-2022-jp"
+    when /euc|euc-jp/i
+      out_code = "euc-jp"
+    end
+  end
+      
+  q.on("-IPATH", "--include-path=PATH",
+       String,
+       "add PATH to list of include path") do |i|
+    # add to include path
+    include_path.unshift(i)
+  end
+  
+  q.on_tail("--help",
+	    "print this message") do
+    STDERR.print(q.to_s)
+    exit(0)
+  end
+end # OptionParser.new
+
+# require format lib implicitly
+unless File.basename($0) == "rt2"
+  require "rt/" + File.basename($0) + "-lib.rb"
+  require $RT2_Sub_OptionParser  if $RT2_Sub_OptionParser
+  # make visitor
+  $Visitor = $Visitor_Class.new()
+end
+
+begin
+  ARGV.parse!
+rescue
+  STDERR.print("Error: " + $!.inspect + "\n")
+  STDERR.print(ARGV.options.to_s)
+  exit(1)
+end
+
+unless $Visitor_Class
+  require $DEFAULT_FORMAT_LIB
+  $Visitor = $Visitor_Class.new
+end
+
+
+# file base name setup
+$Visitor.filename = output_file if output_file
+
+# character encoding
+if out_code
+  begin
+    $Visitor.charcode = out_code
+  rescue NameError
+  end
+end
+
+parsed = RTParser::parse(readlines.join)
+# output  
+out = $Visitor.visit(parsed)
+
+# character encoding convert
+out = Kconv.kconv(out, Kconv.name2const(out_code), Kconv::AUTO) if out_code
+
+if output_file
+  filename = output_file + "." + $Visitor.type::OUTPUT_SUFFIX
+  file = open(filename, "w")
+  file.print(out)
+  file.close
+  STDERR.print("#{$0}: output to #{filename}...\n")
+else
+  print(out)
+end
+

data/examples/rttest.html

@@ -4,7 +4,7 @@
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>rttest.rd</title>
+<title>examples/rttest.rd</title>
 </head>
 <body>
 <h1><a name="label-0" id="label-0">Sample RD/RT</a></h1><!-- RDLabel: "Sample RD/RT" -->

data/lib/rt/rt2html-lib.rb

@@ -1,18 +1,17 @@
 #!/usr/bin/ruby
 =begin
 rt2html-lib.rb
-$Id: rt2html-lib.rb 603 2005-10-22 08:05:44Z rubikitch $
+$Id: rt2html-lib.rb 1531 2009-01-21 17:21:23Z rubikitch $
 =end
 require 'rt/rtvisitor'
+require 'cgi'
 
 module RT
   class RT2HTMLVisitor < RTVisitor
     OUTPUT_SUFFIX = "html"
     INCLUDE_SUFFIX = ["html"]
     
-    def initialize
-      super
-    end
+    def initialize() super end
     
     def block(name)
       %Q[<!-- #{name} -->\n] +
@@ -21,10 +20,13 @@ module RT
     end
     private :block
 
+    def esc(str) CGI.escapeHTML(str) end
+    private :esc
+
     def setup
       block('setup') do
         s = %Q[<table border="1">\n]
-        s << %Q[<caption>#{caption}</caption>\n] if caption
+        s << %Q[<caption>#{esc(caption)}</caption>\n] if caption
         s
       end
     end
@@ -60,7 +62,7 @@ module RT
             ret << '<tr>'
             each_cell(line) do |cell|
               ret << cell_element(cell, 'th')
-              ret << cell.value
+              ret << esc(cell.value)
               ret << '</th>'
             end
             ret << "</tr>\n"
@@ -77,7 +79,7 @@ module RT
           ret << '<tr>'
           each_cell(line) do |cell|
             ret << cell_element(cell, %Q[td align="#{cell.align.id2name}"])
-            ret << cell.value
+            ret << esc(cell.value)
             ret << '</td>'
           end
           ret << "</tr>\n"

data/lib/rt/rtvisitor.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
 =begin
 rtvisitor.rb
-$Id: rtvisitor.rb 597 2005-10-18 21:03:12Z rubikitch $
+$Id: rtvisitor.rb 1531 2009-01-21 17:21:23Z rubikitch $
 =end
 require 'rt/rtparser'
 
@@ -11,7 +11,6 @@ module RT
       ary.each do |x|
         if x.class == RT::RTCell
           yield x
-        else
         end
       end
     end
@@ -33,11 +32,7 @@ module RT
       @body = @rt.body
       @caption = @rt.config['caption']
 
-      setup +
-        visit_Caption +
-        visit_Header +
-        visit_Body +
-        teardown
+      setup + visit_Caption + visit_Header + visit_Body + teardown
     end
     
     def setup

data/rttool.en.html

@@ -14,23 +14,24 @@
 <ul>
 <li><p><a href="#label:1">What's new</a></p>
 <ul>
-<li><a href="#label:2">[2006/09/20] 1.0.2 released</a></li>
-<li><a href="#label:3">[2005/10/28] 1.0.1 released</a></li>
-<li><a href="#label:4">[2005/10/26] 1.0.0 released</a></li>
+<li><a href="#label:2">[2009/01/25] 1.0.3 released</a></li>
+<li><a href="#label:3">[2006/09/20] 1.0.2 released</a></li>
+<li><a href="#label:4">[2005/10/28] 1.0.1 released</a></li>
+<li><a href="#label:5">[2005/10/26] 1.0.0 released</a></li>
 </ul></li>
-<li><a href="#label:5">Abstract</a></li>
-<li><a href="#label:6">Environment</a></li>
-<li><a href="#label:7">Install</a></li>
-<li><a href="#label:8">RT Syntax</a></li>
-<li><a href="#label:12">Attributes</a></li>
-<li><p><a href="#label:18">Examples</a></p>
+<li><a href="#label:6">Abstract</a></li>
+<li><a href="#label:7">Environment</a></li>
+<li><a href="#label:8">Install</a></li>
+<li><a href="#label:9">RT Syntax</a></li>
+<li><a href="#label:13">Attributes</a></li>
+<li><p><a href="#label:19">Examples</a></p>
 <ul>
-<li><a href="#label:19">The Easiest RT</a></li>
-<li><a href="#label:20">Use the Escape Attribute</a></li>
-<li><a href="#label:21">More Complex RT</a></li>
-<li><a href="#label:22">RT Included by RD (RD/RT)</a></li>
+<li><a href="#label:20">The Easiest RT</a></li>
+<li><a href="#label:21">Use the Escape Attribute</a></li>
+<li><a href="#label:22">More Complex RT</a></li>
+<li><a href="#label:23">RT Included by RD (RD/RT)</a></li>
 </ul></li>
-<li><a href="#label:23">License</a></li>
+<li><a href="#label:24">License</a></li>
 </ul>
 <hr />
 
@@ -38,65 +39,71 @@
 
 <h2><a name="1" href="#1">1</a> <a name="label:1">What's new</a></h2><!-- RDLabel: "What's new" -->
 
-<h3><a name="1.1" href="#1.1">1.1</a> <a name="label:2">[2006/09/20] 1.0.2 released</a></h3><!-- RDLabel: "[2006/09/20] 1.0.2 released" -->
+<h3><a name="1.1" href="#1.1">1.1</a> <a name="label:2">[2009/01/25] 1.0.3 released</a></h3><!-- RDLabel: "[2009/01/25] 1.0.3 released" -->
+
+<ul>
+<li>HTML XSS bug fix.</li>
+<li>RTtool works with Ruby 1.9 now.</li>
+</ul>
+<h3><a name="1.2" href="#1.2">1.2</a> <a name="label:3">[2006/09/20] 1.0.2 released</a></h3><!-- RDLabel: "[2006/09/20] 1.0.2 released" -->
 
 <ul>
 <li>Bugfix about linefeed.</li>
 </ul>
-<h3><a name="1.2" href="#1.2">1.2</a> <a name="label:3">[2005/10/28] 1.0.1 released</a></h3><!-- RDLabel: "[2005/10/28] 1.0.1 released" -->
+<h3><a name="1.3" href="#1.3">1.3</a> <a name="label:4">[2005/10/28] 1.0.1 released</a></h3><!-- RDLabel: "[2005/10/28] 1.0.1 released" -->
 
 <ul>
 <li>RTtool does not use .rd2rc anymore.</li>
 </ul>
-<h3><a name="1.3" href="#1.3">1.3</a> <a name="label:4">[2005/10/26] 1.0.0 released</a></h3><!-- RDLabel: "[2005/10/26] 1.0.0 released" -->
+<h3><a name="1.4" href="#1.4">1.4</a> <a name="label:5">[2005/10/26] 1.0.0 released</a></h3><!-- RDLabel: "[2005/10/26] 1.0.0 released" -->
 
 <ul>
 <li>Escape.</li>
 <li>English document.</li>
 <li>Removed Ruby-1.8 warning.</li>
 </ul>
-<h2><a name="2" href="#2">2</a> <a name="label:5">Abstract</a></h2><!-- RDLabel: "Abstract" -->
+<h2><a name="2" href="#2">2</a> <a name="label:6">Abstract</a></h2><!-- RDLabel: "Abstract" -->
 
 <p>RT is a simple and human-readable table format.
 RTtool is a converter from RT into various formats.
 RT can be incorporated into RD.</p>
 <p>At this time, RTtool can convert RT into HTML and plain text.
 To convert into plain text, you need <a href="http://w3m.sourceforge.net/">w3m</a>.</p>
-<h2><a name="3" href="#3">3</a> <a name="label:6">Environment</a></h2><!-- RDLabel: "Environment" -->
+<h2><a name="3" href="#3">3</a> <a name="label:7">Environment</a></h2><!-- RDLabel: "Environment" -->
 
-<h2><a name="4" href="#4">4</a> <a name="label:7">Install</a></h2><!-- RDLabel: "Install" -->
+<h2><a name="4" href="#4">4</a> <a name="label:8">Install</a></h2><!-- RDLabel: "Install" -->
 
 <p>Please execute the following commands.</p>
-<pre>ruby -ropen-uri -e 'URI("http://www.rubyist.net/~rubikitch/archive/rttool-1.0.2.tar.gz").read.display' &gt; rttool-1.0.2.tar.gz</pre>
-<pre>tar xzvf rttool-1.0.2.tar.gz</pre>
+<pre>ruby -ropen-uri -e 'URI("http://www.rubyist.net/~rubikitch/archive/rttool-1.0.3.tar.gz").read.display' &gt; rttool-1.0.3.tar.gz</pre>
+<pre>tar xzvf rttool-1.0.3.tar.gz</pre>
 <p>When you failed, please download it from the next link.</p>
 <ul>
-<li><a href="http://www.rubyist.net/~rubikitch/archive/rttool-1.0.2.tar.gz">rttool-1.0.2.tar.gz</a></li>
+<li><a href="http://www.rubyist.net/~rubikitch/archive/rttool-1.0.3.tar.gz">rttool-1.0.3.tar.gz</a></li>
 </ul>
 <p>Then, install it.</p>
-<pre>cd rttool-1.0.2
+<pre>cd rttool-1.0.3
 ruby setup.rb config
 ruby setup.rb setup
 ruby setup.rb install</pre>
-<h2><a name="5" href="#5">5</a> <a name="label:8">RT Syntax</a></h2><!-- RDLabel: "RT Syntax" -->
+<h2><a name="5" href="#5">5</a> <a name="label:9">RT Syntax</a></h2><!-- RDLabel: "RT Syntax" -->
 
 <ul>
 <li><p>RT consists of three Blocks.</p>
 <dl>
-<dt><a name="label:9" id="label:9"></a>ConfigBlock</dt><!-- RDLabel: "ConfigBlock" -->
+<dt><a name="label:10" id="label:10"></a>ConfigBlock</dt><!-- RDLabel: "ConfigBlock" -->
 <dd>
 <p>ConfigBlock consist of groups of "attribute = value".
 The following examples has <code>caption</code> attribute.
 ConfigBlock can be omitted.</p>
 </dd>
-<dt><a name="label:10" id="label:10"></a>HeaderBlock</dt><!-- RDLabel: "HeaderBlock" -->
+<dt><a name="label:11" id="label:11"></a>HeaderBlock</dt><!-- RDLabel: "HeaderBlock" -->
 <dd>
 <p>A part of THEAD by HTML.
 HeaderBlock sets a header of the table.
 A header is located at the center.
 HeaderBlock can be omitted.</p>
 </dd>
-<dt><a name="label:11" id="label:11"></a>BodyBlock</dt><!-- RDLabel: "BodyBlock" -->
+<dt><a name="label:12" id="label:12"></a>BodyBlock</dt><!-- RDLabel: "BodyBlock" -->
 <dd>
 <p>A part of TBODY by HTML.
 BodyBlock sets data of the table.
@@ -111,35 +118,35 @@ A number is located at the right and others are located at left.</p>
 <li><code>==</code> stretches the left column. (colspan)</li>
 <li><code>||</code> stretches the upper row. (rowspan)</li>
 </ul>
-<h2><a name="6" href="#6">6</a> <a name="label:12">Attributes</a></h2><!-- RDLabel: "Attributes" -->
+<h2><a name="6" href="#6">6</a> <a name="label:13">Attributes</a></h2><!-- RDLabel: "Attributes" -->
 
 <p>In ConfigBlock, these attributes can be set.</p>
 <dl>
-<dt><a name="label:13" id="label:13"></a>caption</dt><!-- RDLabel: "caption" -->
+<dt><a name="label:14" id="label:14"></a>caption</dt><!-- RDLabel: "caption" -->
 <dd>
 <p>The caption of the table.</p>
 </dd>
-<dt><a name="label:14" id="label:14"></a>delimiter</dt><!-- RDLabel: "delimiter" -->
+<dt><a name="label:15" id="label:15"></a>delimiter</dt><!-- RDLabel: "delimiter" -->
 <dd>
 <p>The delimiter of the table.</p>
 </dd>
-<dt><a name="label:15" id="label:15"></a>rowspan</dt><!-- RDLabel: "rowspan" -->
+<dt><a name="label:16" id="label:16"></a>rowspan</dt><!-- RDLabel: "rowspan" -->
 <dd>
 <p>A string which stretches the left column. (defalut: <code>==</code>)</p>
 </dd>
-<dt><a name="label:16" id="label:16"></a>colspan</dt><!-- RDLabel: "colspan" -->
+<dt><a name="label:17" id="label:17"></a>colspan</dt><!-- RDLabel: "colspan" -->
 <dd>
 <p>A string which stretches the upper row. (default: <code>||</code>)</p>
 </dd>
-<dt><a name="label:17" id="label:17"></a>escape</dt><!-- RDLabel: "escape" -->
+<dt><a name="label:18" id="label:18"></a>escape</dt><!-- RDLabel: "escape" -->
 <dd>
 <p>An escape character.
 This attribute is disabled by default.</p>
 </dd>
 </dl>
-<h2><a name="7" href="#7">7</a> <a name="label:18">Examples</a></h2><!-- RDLabel: "Examples" -->
+<h2><a name="7" href="#7">7</a> <a name="label:19">Examples</a></h2><!-- RDLabel: "Examples" -->
 
-<h3><a name="7.1" href="#7.1">7.1</a> <a name="label:19">The Easiest RT</a></h3><!-- RDLabel: "The Easiest RT" -->
+<h3><a name="7.1" href="#7.1">7.1</a> <a name="label:20">The Easiest RT</a></h3><!-- RDLabel: "The Easiest RT" -->
 
 <pre>$ cat examples/easiest.rt
 1, 2, 3
@@ -174,7 +181,7 @@ $ rt2 -r rt/rt2html-lib examples/easiest.rt
 &lt;!-- teardown --&gt;
 &lt;/table&gt;
 &lt;!-- teardown end --&gt;</pre>
-<h3><a name="7.2" href="#7.2">7.2</a> <a name="label:20">Use the Escape Attribute</a></h3><!-- RDLabel: "Use the Escape Attribute" -->
+<h3><a name="7.2" href="#7.2">7.2</a> <a name="label:21">Use the Escape Attribute</a></h3><!-- RDLabel: "Use the Escape Attribute" -->
 
 <pre>$ cat examples/escape.rt
 delimiter = ;
@@ -204,7 +211,7 @@ $ rt2 -r rt/rt2html-lib examples/escape.rt
 &lt;!-- teardown --&gt;
 &lt;/table&gt;
 &lt;!-- teardown end --&gt;</pre>
-<h3><a name="7.3" href="#7.3">7.3</a> <a name="label:21">More Complex RT</a></h3><!-- RDLabel: "More Complex RT" -->
+<h3><a name="7.3" href="#7.3">7.3</a> <a name="label:22">More Complex RT</a></h3><!-- RDLabel: "More Complex RT" -->
 
 <pre>$ cat examples/test1.rt
 caption = Test Table
@@ -250,7 +257,7 @@ $ rt2 -r rt/rt2html-lib examples/test1.rt
 &lt;!-- teardown --&gt;
 &lt;/table&gt;
 &lt;!-- teardown end --&gt;</pre>
-<h3><a name="7.4" href="#7.4">7.4</a> <a name="label:22">RT Included by RD (RD/RT)</a></h3><!-- RDLabel: "RT Included by RD (RD/RT)" -->
+<h3><a name="7.4" href="#7.4">7.4</a> <a name="label:23">RT Included by RD (RD/RT)</a></h3><!-- RDLabel: "RT Included by RD (RD/RT)" -->
 
 <pre>$ cat examples/rttest.rd
 =begin
@@ -291,7 +298,7 @@ This RD contains a table. It is so-called RD/RT.
 $B(&(!(*(!(!(*(!(!(*(!(!(*(!(!(%(B
 
 It is simple.</pre>
-<h2><a name="8" href="#8">8</a> <a name="label:23">License</a></h2><!-- RDLabel: "License" -->
+<h2><a name="8" href="#8">8</a> <a name="label:24">License</a></h2><!-- RDLabel: "License" -->
 
 <p>Ruby's</p>
 

data/rttool.en.rd

@@ -6,6 +6,10 @@
 ##### [whats new]
 == What's new
 
+=== [2009/01/25] 1.0.3 released
+* HTML XSS bug fix.
+* RTtool works with Ruby 1.9 now.
+
 === [2006/09/20] 1.0.2 released
 * Bugfix about linefeed.
 
@@ -36,17 +40,17 @@ To convert into plain text, you need ((<w3m|URL:http://w3m.sourceforge.net/>)).
 == Install
 Please execute the following commands.
 
-    ruby -ropen-uri -e 'URI("http://www.rubyist.net/~rubikitch/archive/rttool-1.0.2.tar.gz").read.display' > rttool-1.0.2.tar.gz
-  tar xzvf rttool-1.0.2.tar.gz
+    ruby -ropen-uri -e 'URI("http://www.rubyist.net/~rubikitch/archive/rttool-1.0.3.tar.gz").read.display' > rttool-1.0.3.tar.gz
+  tar xzvf rttool-1.0.3.tar.gz
 
 
 When you failed, please download it from the next link.
 
-* ((<rttool-1.0.2.tar.gz|URL:http://www.rubyist.net/~rubikitch/archive/rttool-1.0.2.tar.gz>))
+* ((<rttool-1.0.3.tar.gz|URL:http://www.rubyist.net/~rubikitch/archive/rttool-1.0.3.tar.gz>))
 
 Then, install it.
 
-  cd rttool-1.0.2
+  cd rttool-1.0.3
   ruby setup.rb config
   ruby setup.rb setup
   ruby setup.rb install

data/rttool.ja.html

@@ -14,29 +14,30 @@
 <ul>
 <li><p><a href="#label:1">$B99?7MzNr(B</a></p>
 <ul>
-<li><a href="#label:2">[2006/09/20] 1.0.2 released</a></li>
-<li><a href="#label:3">[2005/10/28] 1.0.1 released</a></li>
-<li><a href="#label:4">[2005/10/26] 1.0.0 released</a></li>
-<li><a href="#label:5">[2001/11/15] 0.1.7 released</a></li>
-<li><a href="#label:6">[2001/08/07] 0.1.6 released</a></li>
-<li><a href="#label:7">[2001/07/17] 0.1.5 released</a></li>
-<li><a href="#label:8">[2001/07/09] 0.1.4 released</a></li>
-<li><a href="#label:9">[2001/06/03] 0.1.3 released</a></li>
+<li><a href="#label:2">[2009/01/25] 1.0.3 released</a></li>
+<li><a href="#label:3">[2006/09/20] 1.0.2 released</a></li>
+<li><a href="#label:4">[2005/10/28] 1.0.1 released</a></li>
+<li><a href="#label:5">[2005/10/26] 1.0.0 released</a></li>
+<li><a href="#label:6">[2001/11/15] 0.1.7 released</a></li>
+<li><a href="#label:7">[2001/08/07] 0.1.6 released</a></li>
+<li><a href="#label:8">[2001/07/17] 0.1.5 released</a></li>
+<li><a href="#label:9">[2001/07/09] 0.1.4 released</a></li>
+<li><a href="#label:10">[2001/06/03] 0.1.3 released</a></li>
 </ul></li>
-<li><a href="#label:10">$B35MW(B</a></li>
-<li><a href="#label:11">$B%$%s%9%H!<%k(B</a></li>
-<li><a href="#label:12">RT$B$NJ8K!(B</a></li>
-<li><a href="#label:16">$BB0@-0lMw(B</a></li>
-<li><p><a href="#label:22">$BNc(B</a></p>
+<li><a href="#label:11">$B35MW(B</a></li>
+<li><a href="#label:12">$B%$%s%9%H!<%k(B</a></li>
+<li><a href="#label:13">RT$B$NJ8K!(B</a></li>
+<li><a href="#label:17">$BB0@-0lMw(B</a></li>
+<li><p><a href="#label:23">$BNc(B</a></p>
 <ul>
-<li><a href="#label:23">$B0lHV4JC1$J(BRT</a></li>
-<li><a href="#label:24">$B%(%9%1!<%W(B</a></li>
-<li><a href="#label:25">$B$A$g$C$HJ#;($J(BRT</a></li>
-<li><a href="#label:26">RD$B$KKd$a9~$`(B</a></li>
+<li><a href="#label:24">$B0lHV4JC1$J(BRT</a></li>
+<li><a href="#label:25">$B%(%9%1!<%W(B</a></li>
+<li><a href="#label:26">$B$A$g$C$HJ#;($J(BRT</a></li>
+<li><a href="#label:27">RD$B$KKd$a9~$`(B</a></li>
 </ul></li>
-<li><a href="#label:27">$B$J$<$K(BRT</a></li>
-<li><a href="#label:28">TODO</a></li>
-<li><a href="#label:29">$B%i%$%;%s%9(B</a></li>
+<li><a href="#label:28">$B$J$<$K(BRT</a></li>
+<li><a href="#label:29">TODO</a></li>
+<li><a href="#label:30">$B%i%$%;%s%9(B</a></li>
 </ul>
 <hr />
 
@@ -44,48 +45,54 @@
 
 <h2><a name="1" href="#1">1</a> <a name="label:1">$B99?7MzNr(B</a></h2><!-- RDLabel: "$B99?7MzNr(B" -->
 
-<h3><a name="1.1" href="#1.1">1.1</a> <a name="label:2">[2006/09/20] 1.0.2 released</a></h3><!-- RDLabel: "[2006/09/20] 1.0.2 released" -->
+<h3><a name="1.1" href="#1.1">1.1</a> <a name="label:2">[2009/01/25] 1.0.3 released</a></h3><!-- RDLabel: "[2009/01/25] 1.0.3 released" -->
+
+<ul>
+<li>HTML$B=PNO;~$N%/%m%9%5%$%H%9%/%j%W%F%#%s%0@H<e@-$r=$@5!#(B</li>
+<li>Ruby 1.9$BBP1~!#(B</li>
+</ul>
+<h3><a name="1.2" href="#1.2">1.2</a> <a name="label:3">[2006/09/20] 1.0.2 released</a></h3><!-- RDLabel: "[2006/09/20] 1.0.2 released" -->
 
 <ul>
 <li>$B2~9T%3!<%I$,(BDOS, MAC$B$@$H$&$^$/F0:n$7$J$$%P%0$r=$@5!#(B</li>
 </ul>
-<h3><a name="1.2" href="#1.2">1.2</a> <a name="label:3">[2005/10/28] 1.0.1 released</a></h3><!-- RDLabel: "[2005/10/28] 1.0.1 released" -->
+<h3><a name="1.3" href="#1.3">1.3</a> <a name="label:4">[2005/10/28] 1.0.1 released</a></h3><!-- RDLabel: "[2005/10/28] 1.0.1 released" -->
 
 <ul>
 <li>.rd2rc$B$r;H$o$J$/$J$C$?!#(B</li>
 </ul>
-<h3><a name="1.3" href="#1.3">1.3</a> <a name="label:4">[2005/10/26] 1.0.0 released</a></h3><!-- RDLabel: "[2005/10/26] 1.0.0 released" -->
+<h3><a name="1.4" href="#1.4">1.4</a> <a name="label:5">[2005/10/26] 1.0.0 released</a></h3><!-- RDLabel: "[2005/10/26] 1.0.0 released" -->
 
 <ul>
 <li>$B%(%9%1!<%W$G$-$k$h$&$K$J$C$?!#1Q8l$N%I%-%e%a%s%HIUB0!#(B</li>
 <li>Ruby1.8$B$N(Bwarning$B$r:o=|!#(B</li>
 </ul>
-<h3><a name="1.4" href="#1.4">1.4</a> <a name="label:5">[2001/11/15] 0.1.7 released</a></h3><!-- RDLabel: "[2001/11/15] 0.1.7 released" -->
+<h3><a name="1.5" href="#1.5">1.5</a> <a name="label:6">[2001/11/15] 0.1.7 released</a></h3><!-- RDLabel: "[2001/11/15] 0.1.7 released" -->
 
 <ul>
 <li>$BId9f$D$-$N?t;z$G$b1&B7$($K$9$k$h$&$K$7$?!#(B</li>
 </ul>
-<h3><a name="1.5" href="#1.5">1.5</a> <a name="label:6">[2001/08/07] 0.1.6 released</a></h3><!-- RDLabel: "[2001/08/07] 0.1.6 released" -->
+<h3><a name="1.6" href="#1.6">1.6</a> <a name="label:7">[2001/08/07] 0.1.6 released</a></h3><!-- RDLabel: "[2001/08/07] 0.1.6 released" -->
 
 <ul>
 <li>$B6uGr%;%k$N=hM}$G$N%P%0$rBP=h!#(B</li>
 </ul>
-<h3><a name="1.6" href="#1.6">1.6</a> <a name="label:7">[2001/07/17] 0.1.5 released</a></h3><!-- RDLabel: "[2001/07/17] 0.1.5 released" -->
+<h3><a name="1.7" href="#1.7">1.7</a> <a name="label:8">[2001/07/17] 0.1.5 released</a></h3><!-- RDLabel: "[2001/07/17] 0.1.5 released" -->
 
 <ul>
 <li>rt2html-lib.rb: caption$B$,;XDj$7$F$J$$$H$-$O(BCAPTION$BMWAG$r$D$1$J$$$h$&$K!#(B</li>
 </ul>
-<h3><a name="1.7" href="#1.7">1.7</a> <a name="label:8">[2001/07/09] 0.1.4 released</a></h3><!-- RDLabel: "[2001/07/09] 0.1.4 released" -->
+<h3><a name="1.8" href="#1.8">1.8</a> <a name="label:9">[2001/07/09] 0.1.4 released</a></h3><!-- RDLabel: "[2001/07/09] 0.1.4 released" -->
 
 <ul>
 <li>$B$"$*$-$5$s$N(Bsetup.rb$B$r;HMQ!#(B $B$=$l$KH<$$!"%Q%C%1!<%89=@.$rJQ99!#(B</li>
 </ul>
-<h3><a name="1.8" href="#1.8">1.8</a> <a name="label:9">[2001/06/03] 0.1.3 released</a></h3><!-- RDLabel: "[2001/06/03] 0.1.3 released" -->
+<h3><a name="1.9" href="#1.9">1.9</a> <a name="label:10">[2001/06/03] 0.1.3 released</a></h3><!-- RDLabel: "[2001/06/03] 0.1.3 released" -->
 
 <ul>
 <li>rt2html-lib.rb$B$K$*$$$F%?%0$r>.J8;z$KJQ99!#$3$l$G(BXHTML$B$G$bBg>fIW!#(B</li>
 </ul>
-<h2><a name="2" href="#2">2</a> <a name="label:10">$B35MW(B</a></h2><!-- RDLabel: "$B35MW(B" -->
+<h2><a name="2" href="#2">2</a> <a name="label:11">$B35MW(B</a></h2><!-- RDLabel: "$B35MW(B" -->
 
 <p>RTtool$B$O%7%s%W%k$J:nI=%D!<%k!#(B
 RD$B$NGd$j$G$"$k(B<em>$B2DFI@-(B</em>$B$H(B<em>$B$5$^$6$^$J%U%)!<%^%C%H$KJQ492DG=(B</em>$B$r7Q>5$7!"(B
@@ -96,17 +103,17 @@ w3m$B$N(BWindows$BHG$O(BCygwin$B$7$+$J$$$N$G!"(BWindows$B$N?M$O(BCygwin
 HTML$B$X$NJQ49$N$_I,MW$J$i$P(Bw3m$B$OITMW$G$"$k!#(B</p>
 <p>$B@_7W$NJ}$b(BRDtool$B$H;w$;$F$$$k!#(B
 parser$B$H(Bvisitor$B$KJ,$1!"(Brt2html-lib.rb$B$r:n@.!#(B</p>
-<h2><a name="3" href="#3">3</a> <a name="label:11">$B%$%s%9%H!<%k(B</a></h2><!-- RDLabel: "$B%$%s%9%H!<%k(B" -->
+<h2><a name="3" href="#3">3</a> <a name="label:12">$B%$%s%9%H!<%k(B</a></h2><!-- RDLabel: "$B%$%s%9%H!<%k(B" -->
 
 <p>$B0J2<$N%3%^%s%I$r<B9T!#(B</p>
-<pre>ruby -ropen-uri -e 'URI("http://www.rubyist.net/~rubikitch/archive/rttool-1.0.2.tar.gz").read.display' &gt; rttool-1.0.2.tar.gz</pre>
-<pre>tar xzvf rttool-1.0.2.tar.gz</pre>
+<pre>ruby -ropen-uri -e 'URI("http://www.rubyist.net/~rubikitch/archive/rttool-1.0.3.tar.gz").read.display' &gt; rttool-1.0.3.tar.gz</pre>
+<pre>tar xzvf rttool-1.0.3.tar.gz</pre>
 <p>$B<:GT$9$k>l9g$O<!$N%j%s%/$+$i%@%&%s%m!<%I!#(B</p>
 <ul>
-<li><a href="http://www.rubyist.net/~rubikitch/archive/rttool-1.0.2.tar.gz">rttool-1.0.2.tar.gz</a></li>
+<li><a href="http://www.rubyist.net/~rubikitch/archive/rttool-1.0.3.tar.gz">rttool-1.0.3.tar.gz</a></li>
 </ul>
 <p>$B$=$l$+$i<!$N%3%^%s%I$G%$%s%9%H!<%k!#(B</p>
-<pre>cd rttool-1.0.2
+<pre>cd rttool-1.0.3
 ruby setup.rb config
 ruby setup.rb setup
 ruby setup.rb install</pre>
@@ -122,25 +129,25 @@ ruby setup.rb install</pre>
 <li>$BB8:_$9$k$H$-$O!":9J,$rE,59@_Dj$9$k!#(B</li>
 </ul></li>
 </ol>
-<h2><a name="4" href="#4">4</a> <a name="label:12">RT$B$NJ8K!(B</a></h2><!-- RDLabel: "RT$B$NJ8K!(B" -->
+<h2><a name="4" href="#4">4</a> <a name="label:13">RT$B$NJ8K!(B</a></h2><!-- RDLabel: "RT$B$NJ8K!(B" -->
 
 <ul>
 <li><p>RT$B$O(B3$B$D$N(BBlock$B$G9=@.$5$l$k(B</p>
 <dl>
-<dt><a name="label:13" id="label:13"></a>ConfigBlock</dt><!-- RDLabel: "ConfigBlock" -->
+<dt><a name="label:14" id="label:14"></a>ConfigBlock</dt><!-- RDLabel: "ConfigBlock" -->
 <dd>
 <p>$B!VB0@-(B = $BCM!W$NAH$+$i$J$k!#(B
 $B0J2<$NNc$G$O(B caption $BB0@-$r@_Dj$7!"I=Bj$r$D$1$F$$$k!#(B
 $B$3$N(BBlock$B$O>JN,$G$-$k!#(B</p>
 </dd>
-<dt><a name="label:14" id="label:14"></a>HeaderBlock</dt><!-- RDLabel: "HeaderBlock" -->
+<dt><a name="label:15" id="label:15"></a>HeaderBlock</dt><!-- RDLabel: "HeaderBlock" -->
 <dd>
 <p>HTML$B$G$$$&(BTHEAD$B$NItJ,!#(B
 $BI=$N%X%C%@$r@_Dj$9$k!#(B
 $B%X%C%@$OCf1{B7$($K$J$k!#(B
 $B$3$N(BBlock$B$b>JN,$G$-$k!#(B</p>
 </dd>
-<dt><a name="label:15" id="label:15"></a>BodyBlock</dt><!-- RDLabel: "BodyBlock" -->
+<dt><a name="label:16" id="label:16"></a>BodyBlock</dt><!-- RDLabel: "BodyBlock" -->
 <dd>
 <p>HTML$B$G$$$&(BTBODY$B$NItJ,!#(B
 $B%G!<%?$r5-=R$9$k!#(B
@@ -164,35 +171,35 @@ ruby setup.rb install</pre>
 <li>colspan $BB0@-$NCM$rJQ$($k$3$H$GG$0U$NJ8;z$K$G$-$k!#(B</li>
 </ul></li>
 </ul>
-<h2><a name="5" href="#5">5</a> <a name="label:16">$BB0@-0lMw(B</a></h2><!-- RDLabel: "$BB0@-0lMw(B" -->
+<h2><a name="5" href="#5">5</a> <a name="label:17">$BB0@-0lMw(B</a></h2><!-- RDLabel: "$BB0@-0lMw(B" -->
 
 <p>ConfigBlock$B$G$O<!$NB0@-$,@_Dj$G$-$k!#(B</p>
 <dl>
-<dt><a name="label:17" id="label:17"></a>caption</dt><!-- RDLabel: "caption" -->
+<dt><a name="label:18" id="label:18"></a>caption</dt><!-- RDLabel: "caption" -->
 <dd>
 <p>$BI=$N%?%$%H%k$r@_Dj$9$k!#(B</p>
 </dd>
-<dt><a name="label:18" id="label:18"></a>delimiter</dt><!-- RDLabel: "delimiter" -->
+<dt><a name="label:19" id="label:19"></a>delimiter</dt><!-- RDLabel: "delimiter" -->
 <dd>
 <p>$B%G!<%?$N6h@Z$r;XDj$9$k!#(B</p>
 </dd>
-<dt><a name="label:19" id="label:19"></a>rowspan</dt><!-- RDLabel: "rowspan" -->
+<dt><a name="label:20" id="label:20"></a>rowspan</dt><!-- RDLabel: "rowspan" -->
 <dd>
 <p>$B:8$NNs$r?-$P$9;XDj!#!J%G%U%)%k%H$O(B<code>==</code>$B!K(B</p>
 </dd>
-<dt><a name="label:20" id="label:20"></a>colspan</dt><!-- RDLabel: "colspan" -->
+<dt><a name="label:21" id="label:21"></a>colspan</dt><!-- RDLabel: "colspan" -->
 <dd>
 <p>$B>e$N9T$r?-$P$9@_Dj!#!J%G%U%)%k%H$O(B<code>||</code>$B!K(B</p>
 </dd>
-<dt><a name="label:21" id="label:21"></a>escape</dt><!-- RDLabel: "escape" -->
+<dt><a name="label:22" id="label:22"></a>escape</dt><!-- RDLabel: "escape" -->
 <dd>
 <p>delimiter$B$r%G!<%?$K4^$a$kI,MW$,$"$k$H$-$K$3$NB0@-$G;XDj$5$l$?J8;z$rA0CV$9$k!#(B
 $B%G%U%)%k%H$G$OL58z$H$J$C$F$$$k!#(B</p>
 </dd>
 </dl>
-<h2><a name="6" href="#6">6</a> <a name="label:22">$BNc(B</a></h2><!-- RDLabel: "$BNc(B" -->
+<h2><a name="6" href="#6">6</a> <a name="label:23">$BNc(B</a></h2><!-- RDLabel: "$BNc(B" -->
 
-<h3><a name="6.1" href="#6.1">6.1</a> <a name="label:23">$B0lHV4JC1$J(BRT</a></h3><!-- RDLabel: "$B0lHV4JC1$J(BRT" -->
+<h3><a name="6.1" href="#6.1">6.1</a> <a name="label:24">$B0lHV4JC1$J(BRT</a></h3><!-- RDLabel: "$B0lHV4JC1$J(BRT" -->
 
 <p>$BCM$r%+%s%^$G6h@Z$k$N$,0lHV4JC1$J(BRT$B!#(B</p>
 <pre>$ cat examples/easiest.rt
@@ -228,7 +235,7 @@ $ rt2 -r rt/rt2html-lib examples/easiest.rt
 &lt;!-- teardown --&gt;
 &lt;/table&gt;
 &lt;!-- teardown end --&gt;</pre>
-<h3><a name="6.2" href="#6.2">6.2</a> <a name="label:24">$B%(%9%1!<%W(B</a></h3><!-- RDLabel: "$B%(%9%1!<%W(B" -->
+<h3><a name="6.2" href="#6.2">6.2</a> <a name="label:25">$B%(%9%1!<%W(B</a></h3><!-- RDLabel: "$B%(%9%1!<%W(B" -->
 
 <p>RT$B$O(Bdelimiter$B$r<+M3$K;XDj$G$-$k$,!"(Bdelimiter$B$rCO$NJ8$K4^$a$kI,MW$,$"$k$H$-!"(B</p>
 <ul>
@@ -264,7 +271,7 @@ $ rt2 -r rt/rt2html-lib examples/escape.rt
 &lt;!-- teardown --&gt;
 &lt;/table&gt;
 &lt;!-- teardown end --&gt;</pre>
-<h3><a name="6.3" href="#6.3">6.3</a> <a name="label:25">$B$A$g$C$HJ#;($J(BRT</a></h3><!-- RDLabel: "$B$A$g$C$HJ#;($J(BRT" -->
+<h3><a name="6.3" href="#6.3">6.3</a> <a name="label:26">$B$A$g$C$HJ#;($J(BRT</a></h3><!-- RDLabel: "$B$A$g$C$HJ#;($J(BRT" -->
 
 <pre>$ cat examples/test1.rt
 caption = Test Table
@@ -310,7 +317,7 @@ $ rt2 -r rt/rt2html-lib examples/test1.rt
 &lt;!-- teardown --&gt;
 &lt;/table&gt;
 &lt;!-- teardown end --&gt;</pre>
-<h3><a name="6.4" href="#6.4">6.4</a> <a name="label:26">RD$B$KKd$a9~$`(B</a></h3><!-- RDLabel: "RD$B$KKd$a9~$`(B" -->
+<h3><a name="6.4" href="#6.4">6.4</a> <a name="label:27">RD$B$KKd$a9~$`(B</a></h3><!-- RDLabel: "RD$B$KKd$a9~$`(B" -->
 
 <p>$B$5$i$K!"(BRD$B$KKd$a9~$`$3$H$b$G$-$k$N$@!#(B
 RT$B$O(B<em>RD$B$G$O$J$$$N$G(BRD$B$N(Bfilter$B5!G=$r;H$&(B</em>$B$3$H$K$J$k!#(B
@@ -356,7 +363,7 @@ This RD contains a table. It is so-called RD/RT.
 $B(&(!(*(!(!(*(!(!(*(!(!(*(!(!(%(B
 
 It is simple.</pre>
-<h2><a name="7" href="#7">7</a> <a name="label:27">$B$J$<$K(BRT</a></h2><!-- RDLabel: "$B$J$<$K(BRT" -->
+<h2><a name="7" href="#7">7</a> <a name="label:28">$B$J$<$K(BRT</a></h2><!-- RDLabel: "$B$J$<$K(BRT" -->
 
 <ul>
 <li><p>HTML$B$d(BLaTeX$B$NI=$N=q$-J}$,$A$g$$%$%i$D$/!#(B</p>
@@ -372,10 +379,10 @@ It is simple.</pre>
 <li>$B26$,(BRD$B$r0&$7$F$k$+$i!#(B</li>
 <li>$B<+J,$K9g$C$?I=:n@.%D!<%k$,$[$7$$!#(B</li>
 </ul>
-<h2><a name="8" href="#8">8</a> <a name="label:28">TODO</a></h2><!-- RDLabel: "TODO" -->
+<h2><a name="8" href="#8">8</a> <a name="label:29">TODO</a></h2><!-- RDLabel: "TODO" -->
 
-<p>$BLs(B6$BG/!"$$$m$$$m$J$3$H$r9M$($F$$$?$,8=:_$N%7%s%W%k$J;EMM$N$^$^$,$$$$$HH=CG$7$?!#(B</p>
-<h2><a name="9" href="#9">9</a> <a name="label:29">$B%i%$%;%s%9(B</a></h2><!-- RDLabel: "$B%i%$%;%s%9(B" -->
+<p>$BLs(B9$BG/!"$$$m$$$m$J$3$H$r9M$($F$$$?$,8=:_$N%7%s%W%k$J;EMM$N$^$^$,$$$$$HH=CG$7$?!#(B</p>
+<h2><a name="9" href="#9">9</a> <a name="label:30">$B%i%$%;%s%9(B</a></h2><!-- RDLabel: "$B%i%$%;%s%9(B" -->
 
 <p>Ruby's$B$H$7$^$9!#(B</p>
 

data/rttool.ja.rd

@@ -5,6 +5,10 @@
 
 ##### [whats new]
 == ��������
+=== [2009/01/25] 1.0.3 released
+* HTML���ϻ��Υ����������ȥ�����ץƥ����ȼ���������
+* Ruby 1.9���
+
 === [2006/09/20] 1.0.2 released
 *  ���ԥ����ɤ�DOS, MAC���Ȥ��ޤ�ư��ʤ��Х�������
 
@@ -49,17 +53,17 @@ parser
 == ���󥹥ȡ���
 �ʲ��Υ��ޥ�ɤ�¹ԡ�
 
-    ruby -ropen-uri -e 'URI("http://www.rubyist.net/~rubikitch/archive/rttool-1.0.2.tar.gz").read.display' > rttool-1.0.2.tar.gz
-  tar xzvf rttool-1.0.2.tar.gz
+    ruby -ropen-uri -e 'URI("http://www.rubyist.net/~rubikitch/archive/rttool-1.0.3.tar.gz").read.display' > rttool-1.0.3.tar.gz
+  tar xzvf rttool-1.0.3.tar.gz
 
 
 ���Ԥ�����ϼ��Υ�󥯤������������ɡ�
 
-* ((<rttool-1.0.2.tar.gz|URL:http://www.rubyist.net/~rubikitch/archive/rttool-1.0.2.tar.gz>))
+* ((<rttool-1.0.3.tar.gz|URL:http://www.rubyist.net/~rubikitch/archive/rttool-1.0.3.tar.gz>))
 
 ���줫�鼡�Υ��ޥ�ɤǥ��󥹥ȡ��롣
 
-  cd rttool-1.0.2
+  cd rttool-1.0.3
   ruby setup.rb config
   ruby setup.rb setup
   ruby setup.rb install
@@ -309,7 +313,7 @@ begin
 * ��ʬ�˹�ä�ɽ�����ġ��뤬�ۤ�����
 
 == TODO
-��6ǯ�����������ʤ��Ȥ�ͤ��Ƥ��������ߤΥ���ץ�ʻ��ͤΤޤޤ�������Ƚ�Ǥ�����
+��9ǯ�����������ʤ��Ȥ�ͤ��Ƥ��������ߤΥ���ץ�ʻ��ͤΤޤޤ�������Ƚ�Ǥ�����
 
 == �饤����
 Ruby's�Ȥ��ޤ���

data/test/rttool-sub.rb

@@ -180,6 +180,8 @@ module Untar
       "unrar %s"
     when /\.sit$/i
       "ln -s %s tmp.sit; unstuff tmp.sit"
+    when /\.7z$/i
+      "7za e #{f}"
     else
       nil
     end
@@ -311,7 +313,7 @@ class AssertFile
 
   def self.transaction(*args, &block)
     if block_given?
-      testcase = eval("self", block)
+      testcase = eval("self", block.binding)
       assert_files = args.map{|x| new(x) }
 
       if @@basedir
@@ -542,7 +544,7 @@ def system_to_string(*args)
     ret = nil
     open(tmpf,"w") do |f|
       IO.redirect(f) {
-        system *args
+        system(*args)
       }
     end
     File.read(tmpf)
@@ -610,7 +612,7 @@ end
 #### ext
 class String
   # Returns a string which is replaced the filename's extension with NEWEXT.
-  def ext(newext=nil)
+  def my_ext(newext=nil)
     if newext
       newext[0,1] != '.' and newext="."+newext
       sub(/\.[^\.]+?$/, newext)
@@ -670,7 +672,7 @@ class StructWithType < Struct
       end
     end
 
-    super *args
+    super(*args)
   end
 
   def __convert__(k,v)
@@ -875,7 +877,7 @@ end
 # mswin32 ruby's `system' workaround.
 def system_safe(*x)
   begin
-    system *x
+    system(*x)
   rescue
   end
 end
@@ -890,7 +892,7 @@ end
 
 class Proc
   def unproc(*x)
-    call *x
+    call(*x)
   end
 end
 
@@ -917,7 +919,7 @@ class ConfigScript
 
       s_class.class_eval do
         define_method(k) {arg[k].unproc}
-        define_method("#{k}=") {|v| arg[k]=v}
+        define_method("#{k}=") {|vv| arg[k]=vv}
       end
     end
     @hash = arg
@@ -977,6 +979,7 @@ module URLConv
         next
       end
     end
+    html
   end
 end
 

data/test/test-rt2html-lib.rb

@@ -2,6 +2,19 @@ require 'rt/rt2html-lib'
 require 'test/unit'
 
 include RT
+module Utils
+  def uncomment(str)
+    rep = "\001"
+    #if str =~ /\A<!--\s+.+?\s+-->\n(.+)<!--\s+.+?\s+-->\n\n\Z/p# POSIX
+    if str.gsub(/\n/, rep) =~ /\A<!--\s+.+?\s+-->#{rep}(.+)<!--\s+.+?\s+-->#{rep}#{rep}\Z/
+      #$1
+      $1.gsub(/#{rep}/, "\n")
+    else
+      assert_fail("not RTBlock format")
+    end
+  end
+end
+
 class RT2HTMLVisitorTest < Test::Unit::TestCase
   def setup
     @x = RT2HTMLVisitor::new
@@ -15,17 +28,7 @@ class RT2HTMLVisitorTest < Test::Unit::TestCase
       y  , 0.4 , 0.5, 0.3, 0.1
     END
   end
-
-  def uncomment(str)
-    rep = "\001"
-    #if str =~ /\A<!--\s+.+?\s+-->\n(.+)<!--\s+.+?\s+-->\n\n\Z/p# POSIX
-    if str.gsub(/\n/, rep) =~ /\A<!--\s+.+?\s+-->#{rep}(.+)<!--\s+.+?\s+-->#{rep}#{rep}\Z/
-      #$1
-      $1.gsub(/#{rep}/, "\n")
-    else
-      assert_fail("not RTBlock format")
-    end
-  end
+  include Utils
 
   def test_setup
     lines =
@@ -62,4 +65,40 @@ class RT2HTMLVisitorTest < Test::Unit::TestCase
 
 end
 
+class RT2HTMLXSSTest < Test::Unit::TestCase
+  def setup
+    @x = RT2HTMLVisitor::new
+    @x.visit(RTParser::parse(<<-END))
+    caption = <b>XSS Test</b>
+
+    <b>Test</b>, ==
+
+    <b>1.0</b> , <b>a</b>
+    END
+  end
+  include Utils
+
+  def test_setup
+    lines =
+      %Q[<table border="1">\n] +
+      %Q[<caption>&lt;b&gt;XSS Test&lt;/b&gt;</caption>\n]
+    assert_equal(lines, uncomment(@x.setup))
+  end
+
+  def test_visit_Header
+    lines =
+      %Q[<thead>\n] +
+      %Q[<tr><th colspan="2">&lt;b&gt;Test&lt;/b&gt;</th></tr>\n] +
+      %Q[</thead>\n]
+    assert_equal(lines, uncomment(@x.visit_Header))
+  end
+
+  def test_visit_Body
+    lines =
+      %Q[<tbody>\n] +
+      %Q[<tr><td align="left">&lt;b&gt;1.0&lt;/b&gt;</td><td align="left">&lt;b&gt;a&lt;/b&gt;</td></tr>\n] +
+      %Q[</tbody>\n]
+    assert_equal(lines, uncomment(@x.visit_Body))
+  end
+end
 

data/test/test-rtparser.rb

@@ -25,18 +25,10 @@ end
 
                  
 module CellShortcut
-  def c(x)
-    RTCell::new(x,:center)
-  end
-
-  def l(x)
-    RTCell::new(x, :left)
-  end
-
-  def r(x)
-    RTCell::new(x, :right)
-  end
-  private :c, :l, :r
+  private
+  def c(x) RTCell::new(x,:center) end
+  def l(x) RTCell::new(x, :left) end
+  def r(x) RTCell::new(x, :right) end
 end
 
 class RTParserTest < Test::Unit::TestCase
@@ -127,17 +119,9 @@ class RTParseTest < Test::Unit::TestCase
   include CellShortcut
   module CRLF
     include NKF
-    def to_unix(str)
-      nkf("-Lu", str)
-    end
-
-    def to_dos(str)
-      nkf("-Lw", str)
-    end
-
-    def to_mac(str)
-      nkf("-Lm", str)
-    end
+    def to_unix(str) nkf("-eLu", str) end
+    def to_dos(str) nkf("-eLw", str) end
+    def to_mac(str) nkf("-eLm", str) end
   end
 
   def setup

data/test/test.rb

@@ -1,87 +1,54 @@
 #!/usr/bin/env ruby
+require 'pathname'
 require 'test/unit'
-require 'rttool-sub'
-
-module Chdir
-  def pushd
-    @pwd = Dir.pwd
-    Dir.chdir File.dirname(File.expand_path(__FILE__))
-  end
-
-  def popd
-    Dir.chdir @pwd
-  end
-  def setup
-    pushd
-  end
-end
-
 class TestRTtool < Test::Unit::TestCase
 =begin eev
 = How to make test files
  (eecd2)
-cd ../examples/; rt2 -r rt/rt2html-lib test1.rt > test1.html
-cd ../examples/; rt2 -r rt/rt2html-lib test2.rt > test2.html
-cd ../examples/; rt2 -r rt/rt2html-lib escape.rt > escape.html
-cd ../examples/; rd2  --with-part=RT:rt rttest.rd > rttest.html
+cd ..; rt2 -r rt/rt2html-lib examples/test1.rt > examples/test1.html
+cd ..; rt2 -r rt/rt2html-lib examples/test2.rt > examples/test2.html
+cd ..; rt2 -r rt/rt2html-lib examples/escape.rt > examples/escape.html
+cd ..; rd2  --with-part=RT:rt examples/rttest.rd > examples/rttest.html
 =end
-  include Chdir
-  def teardown
-    rt2html
-    popd
-  end
-
-  def rt2html
-    @html = "#{@name}.html"
-    @rt = "#{@name}.rt"
-    AssertFile.basedir = "../examples"
-    AssertFile.transaction(@html) do |html|
-      system_safe "cd ../examples; ruby -I../lib ../bin/rt/rt2 -r rt/rt2html-lib #{@rt} > #{html}"
+  def rt2html(name)
+    Dir.chdir(Pathname.new(__FILE__).dirname.parent) do 
+      @html = "examples/#{name}.html"
+      @rt = "examples/#{name}.rt"
+      assert_equal File.read(@html), `ruby -Itest -Ilib bin/rt/rt2 -r rt/rt2html-lib #{@rt}`
     end
   end
 
-#
   def test__test1
     # (find-filez "test1.rt test1.html" "../examples/")
-    @name = "test1"
+    rt2html "test1"
   end
-#
 
   def test__test2
     # (find-filez "test2.rt test2.html" "../examples/")
-    @name = "test2"
+    rt2html "test2"
   end
 
   def test__escape
     # (find-filez "escape.rt escape.html" "../examples/")
-    @name = "escape"
+    rt2html "escape"
   end
 
 end
 
 
 class TestRDRT2 < Test::Unit::TestCase
-
-  include Chdir
-
-  def teardown
-    rdrt2
-    popd
-  end
-
-  def rdrt2
+  def rdrt2(name)
     ENV['RUBYLIB'] = "../lib"
-    @html = "#{@name}.html"
-    @rd = "#{@name}.rd"
-    AssertFile.basedir = "../examples"
-    AssertFile.transaction(@html) do |html|
-      system_safe "cd ../examples; ruby ../bin/rt/rdrt2  #{@rd} > #{html}"
+    @html = "examples/#{name}.html"
+    @rd = "examples/#{name}.rd"
+    Dir.chdir(Pathname.new(__FILE__).dirname.parent) do 
+      assert_equal File.read(@html), `ruby -Ilib bin/rt/rdrt2 #{@rd}`
     end
   end
 
   def test_rttest
     # (find-filez "rttest.rd rttest.html" "../examples/")
-    @name = "rttest"
+    rdrt2 "rttest"
   end
   
   

metadata

@@ -1,39 +1,35 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: rttool
 version: !ruby/object:Gem::Version 
-  version: 1.0.2.0
-date: 2007-02-21 00:00:00 +09:00
-summary: Simple table generator
-require_paths: 
-- lib
-email: zn@mbf.nifty.com
-homepage: http://raa.ruby-lang.org/project/rttool/
-rubyforge_project: rwiki
-description: 
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.0.3.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - rubikitch
 - Kazuhiro NISHIYAMA
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-01-28 00:00:00 +09:00
+default_executable: 
+dependencies: []
+
+description: 
+email: zn@mbf.nifty.com
+executables: 
+- rdrt2
+- rt2
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
 - ChangeLog
 - GPL
+- bin/rdrt2
 - bin/rt/rdrt2
 - bin/rt/rt2
+- bin/rt2
 - examples/easiest.html
 - examples/easiest.rt
 - examples/escape.html
@@ -58,18 +54,31 @@ files:
 - test/test-rt2html-lib.rb
 - test/test-rtparser.rb
 - test/test.rb
-test_files: []
-
+has_rdoc: false
+homepage: http://raa.ruby-lang.org/project/rttool/
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: []
-
-executables: 
-- rt/rdrt2
-- rt/rt2
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: rwiki
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Simple table generator
+test_files: []