ruby-list

むらけんです.  TO が ML ぢゃなくて Tosh さんになってた...
Tosh さん2重になってしまってすみません.


興味本意なんですが, rdtool-0.6.7 に出力ファイルを分割するため
の改造をやってみました.  改造方法自体汚ないものなんですが, あ
と一歩の所でうまく分割できずにいます.  僕の改造では,
--split=LEVEL というオプションを追加して, LEVEL の数値に対応す
る HeadLine でファイルを分割します.  例えば LEVEL=2 では,

= HEAD1-1

# ここで分割
== HEAD2-1

=== HEAD3-1

=== HEAD3-2

# ここで分割
== HEAD2-2

=== HEAD3-3

# ここで分割
= HEAD1-2

という具合です.  できてそうなんですが, footnote の参照が上手く
いってません.

diff の結果を添付しましたので, どなたか試して感想などお聞かせ
ください.

-- 
Kenta MURATA <muraken2@nifty.com> "http://village.infoweb.ne.jp/~muraken/"

diff -uNr rdtool-0.6.7.orig/rd/rd2html-lib.rb rdtool-0.6.7/rd/rd2html-lib.rb
--- rdtool-0.6.7.orig/rd/rd2html-lib.rb	Sun Jan 28 04:39:03 2001
+++ rdtool-0.6.7/rd/rd2html-lib.rb	Sun Mar 25 17:27:40 2001
@@ -27,6 +27,9 @@
     attr(:use_old_anchor, true)
     # output external Label file.
     attr(:output_rbl, true)
+    # file splitting level of '='
+    attr(:split_level, true)
+    attr(:count_files)
 
     def initialize
       @css = nil
@@ -42,6 +45,10 @@
       #      @use_old_anchor = nil
       @use_old_anchor = true # MUST -> nil
       @output_rbl = nil
+      @split_level = 0
+      @count_files = 1
+      @now_file_no = 0
+      @label_hash = {}
       super
     end
     
@@ -52,11 +59,25 @@
       tmp
     end
 
-    def apply_to_DocumentElement(element, content)
-      content = content.join("")
-      index = make_index()
-      foottext = make_foottext()
-      title = @title || @filename || ARGF.filename || "Untitled"
+    def navi
+      ret = %Q[]
+      if @count_files > 1
+	prevfile = 'prev'
+	if @now_file_no > 1
+	  prevfile = "#{filename}-#{@now_file_no - 1}.html"
+	  prevfile = %Q[<a href="#{prevfile}">prev</a>]
+	end
+	nextfile = 'next'
+	if @now_file_no < @count_files
+	  nextfile = "#{filename}-#{@now_file_no + 1}.html"
+	  nextfile = %Q[<a href="#{nextfile}">next</a>]
+	end
+	ret << %Q[<div id="navi">#{prevfile}&nbsp;&nbsp;&nbsp;&nbsp;#{nextfile}</a></div>]
+      end
+      ret
+    end
+
+    def file_header(title)
       ret = %Q[]
       if @charset
 	ret << %Q[<?xml version="1.0" encoding="#{@charset}" ?>\n]
@@ -87,18 +108,50 @@
       @html_link_rev.each do |rev, href|
 	ret << %Q[<link rev="#{rev}" href="#{href}" />\n]
       end
+      ret << %Q[</head>\n<body>\n#{navi}\n<hr />\n]
+      ret
+    end
+
+    def file_footer
+      ret = %Q[\n<hr />\n#{navi}\n</body>\n</head>\n]
+    end
+
+    def apply_to_DocumentElement(element, content)
+      content = content.join("")
+      index = make_index()
+      foottext = make_foottext()
+      ret = %Q[]
+      @now_file_no = 1
+      ret << file_header(@title || @filename || ARGF.filename || "Untitled")
+      @now_file_no = 0
 
-      ret << %Q[</head>\n]
 #      ret << %Q[<BODY>\n#{content}#{index}#{foottext}\n</BODY>\n</HTML>]
-      ret << %Q[<body>\n#{content}#{foottext}\n</body>\n</html>\n]
+#      ret << %Q[<body>\n#{content}#{foottext}\n</body>\n</html>\n]
+      ret << %Q[#{content}#{foottext}]
+      ret << file_footer
       ret
     end
+
+    def apply_to_Comment(element, content)
+      process_instruction ($') if content =~ /^@@/
+    end
     
     def apply_to_Headline(element, title)
+      ret = %Q[]
+      if element.level <= @split_level
+	if @now_file_no > 0
+	  ret << file_footer
+	  ret << %Q[\C-l\C-l]
+	end
+	@now_file_no += 1
+	if @now_file_no > 0
+	  ret << file_header(@title || @filename || ARGF.filename || "Untitled")
+	end
+      end
       anchor = refer(element)
       label = hyphen_escape(element.label)
-      %Q[<h#{element.level}><a name="#{anchor}" id="#{anchor}">#{title}</a>] +
-      %Q[</h#{element.level}><!-- RDLabel: "#{label}" -->\n]
+      ret << %Q[<h#{element.level}><a name="#{anchor}" id="#{anchor}">#{title}</a>] +
+	%Q[</h#{element.level}><!-- RDLabel: "#{label}" -->\n]
     end
 
     # RDVisitor#apply_to_Include 
@@ -229,8 +282,12 @@
     def apply_to_RefToElement(element, content)
       content = content.join("")
       if anchor = refer(element)
+	filename = ''
+	if @label_hash[anchor] && @label_hash[anchor] != @now_file_no
+	  filename = "#{@filename}-#{@label_hash[anchor]}.html"
+	end
 	content = content.sub(/^function#/, "")
-	%Q[<a href="\##{anchor}">#{content}</a>]
+	%Q[<a href="#{filename}\##{anchor}">#{content}</a>]
       else
 	# warning?
 	label = hyphen_escape(element.to_label)
@@ -279,12 +336,30 @@
       meta_char_escape(element)
     end
 
+    def prepare_level(tree)
+      if @filename && @split_level
+	@count_files = 0
+	tree.each { |elem|
+	  if elem.type == Headline
+	    @count_files += 1 if elem.level <= @split_level
+	  end
+	  if (elem.type == Headline) \
+	    || (elem.type == DescListItem) \
+	    || (elem.type == MethodListItem)
+	    @label_hash[refer(elem)] = @count_files
+	  end
+	}
+      end
+      p @label_hash
+    end
+
     def prepare_labels(tree, prefix = "label:")
       if @use_old_anchor
 	super
       else
 	prepare_labels_with_url_escape(tree, prefix)
       end
+      prepare_level(tree)
     end
     private :prepare_labels
       
@@ -429,6 +504,16 @@
       end
     end
     private :make_foottext
+
+    def process_instruction (inst)
+      case inst
+      when /^tableofcontents/
+	# toc
+      when /^tocdepth=/
+	@tocdepth = $'.to_i
+      end
+    end
+    private :process_instruction
     
   end # RD2HTMLVisitor
 end # RD
diff -uNr rdtool-0.6.7.orig/rd/rdblockparser.ry rdtool-0.6.7/rd/rdblockparser.ry
--- rdtool-0.6.7.orig/rd/rdblockparser.ry	Tue Jan 30 02:30:56 2001
+++ rdtool-0.6.7/rd/rdblockparser.ry	Sun Mar 25 16:19:09 2001
@@ -24,7 +24,7 @@
           | lists 
           | headline      { result = val }
           | include       { result = val }
-          | WHITELINE     { result = [] }
+          | WHITELINE     { if val[1] == '(:COMMENT)'; result = val; else result = []; end }
           | SUBTREE       { result = val[0].blocks }
           ;
 
diff -uNr rdtool-0.6.7.orig/rd/rdfmt.rb rdtool-0.6.7/rd/rdfmt.rb
--- rdtool-0.6.7.orig/rd/rdfmt.rb	Fri Jun  9 23:09:54 2000
+++ rdtool-0.6.7/rd/rdfmt.rb	Sun Mar 25 13:34:08 2001
@@ -7,6 +7,7 @@
 following classes are defined in rdfmt.rb.
 *RDElement
   *BlockElement
+    *Comment
     *TextBlock
     *Verbatim
     *Headline
@@ -151,6 +152,17 @@
 =end
   
   class BlockElement < RDElement
+  end
+
+  class Comment < BlockElement
+    attr(:content, true)
+    def initialize(content)
+      @content = content         # Comment String
+    end
+    
+    def accept(visitor)
+      visitor.visit_Comment(self)
+    end
   end
 
   class Headline < BlockElement
diff -uNr rdtool-0.6.7.orig/rd/rdvisitor.rb rdtool-0.6.7/rd/rdvisitor.rb
--- rdtool-0.6.7.orig/rd/rdvisitor.rb	Sun Jan 14 14:43:43 2001
+++ rdtool-0.6.7/rd/rdvisitor.rb	Sun Mar 25 14:02:11 2001
@@ -67,6 +67,10 @@
       end
       apply_to_DocumentElement(element, blocks)
     end
+
+    def visit_Comment(element)
+      apply_to_Comment(element, element.content)
+    end
   
     def visit_Headline(element)
       title = []
diff -uNr rdtool-0.6.7.orig/rd2 rdtool-0.6.7/rd2
--- rdtool-0.6.7.orig/rd2	Tue Jan 30 02:36:16 2001
+++ rdtool-0.6.7/rd2	Sun Mar 25 16:32:12 2001
@@ -56,6 +56,7 @@
 output_index = nil
 out_code = nil
 from_rdo = nil
+split_level = nil
 
 # user option
 $DEFAULT_FORMAT_LIB = "rd/rd2html-lib"
@@ -122,7 +123,13 @@
       include_path.push(RD::RDTree::TMP_DIR)
     end
   end
-  
+
+  q.on("--split=LEVEL",
+       /[1-4]/,
+       "output file is splited at LEVEL of '='") do |i|
+    split_level = i.to_i
+  end
+
   q.on("--from-rdo",
        "load from *.rdo instead of *.rd") do
     from_rdo = true
@@ -157,6 +164,15 @@
   $Visitor = $Visitor_Class.new
 end
 
+# set split level
+begin
+  $Visitor.split_level = split_level
+rescue
+  STDERR.print("Error: specified library is not support to split file\n")
+  STDERR.print(ARGV.options.to_s)
+  exit(1)
+end if split_level && output_file
+
 # make tree (but not parsed yet)
 if from_rdo
   rdos = []
@@ -203,7 +219,7 @@
 
 # file base name setup
 $Visitor.filename = output_file if output_file
-
+$Visitor.split_level = split_level if split_level
 # character encoding
 if out_code
   begin
@@ -217,13 +233,27 @@
 
 # character encoding convert
 out = Kconv.kconv(out, Kconv::NAME2CONST[out_code], Kconv::AUTO) if out_code
+out_list = []
+if split_level
+  out_list = out.split "\C-l\C-l"
+else
+  out_list = [out]
+end
 
 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")
+  i = 1
+  while i <= $Visitor.count_files
+    filename = output_file
+    if split_level
+      filename += "-#{i}"
+    end
+    filename += "." + $Visitor.type::OUTPUT_SUFFIX
+    file = open(filename, "w")
+    file.print(out_list[i-1])
+    file.close
+    STDERR.print("#{$0}: output to #{filename}...\n")
+    i += 1
+  end
 else
   print(out)
 end

Thread

Prev Next

In This Thread

Prev Next

[#28392] Ruby による CGI プログラミング — Keisuke Minami <keisuke@...>

[#28394] 日本語の文章を配列にいれ行の好きな位置から数文字取り出す — Kenji Noda <zaq94465a@...>

[#28397] xml2rb-0.1.2 released — MoonWolf <moonwolf@...>

[#28402] crypt — Kenji Noda <zaq94465a@...>

[#28406] ２５６倍本無道編やっと買いました — M_HANA <M_HANA@...0.sapporo-soft.ac.jp>

[#28408] Fwd: RCR: Input XML support in the base Ruby — TAKAHASHI Masayoshi <maki@...>

[#28415] class Real — 正木 功 <GEC01122@...>

[#28429] Marshal format version — Takahiro Kambe <taca@...>

[#28431] RE:class Real — 正木 功 <GEC01122@...>

[#28435] ruby 1.6.3? — akira yamada / やまだあきら <akira@...>

[#28441] constant in module_eval — Kenichi Komiya <kom@...1.accsnet.ne.jp>

[#28443] DPMI — Kenji Noda <zaq94465a@...>

[#28454] Ruby 初心者は！ — 有瀬 和徳 <crush@...>

[#28475] Ruby Editor for Windows — Kenji Noda <zaq94465a@...>

[#28485] ruby/tk TkEntry#selection_present bug? — Noritsugu Nakamura <nnakamur@...>

[#28530] テキストファイルを固定文字数で切って、行番号をつけるプログラム — Keisuke Minami <keisuke@...>

[#28536] DATA.rewind — URA Takefumi <hage@...>

[#28561] ChibiXML started — MoonWolf <moonwolf@...>

[#28563] watcher2 もどき — Kazuhiko Iwama <iwama@...>

[#28565] 海外無料サーバ — 有瀬 和徳 <crush@...>

[#28577] field sort — Kenji Noda <zaq94465a@...>

[#28585] String#delete — rubikitch@...

[#28587] net/smtp.rb doesn't work with sendmail 8.8.7 — Mitsuhiro Kondo <kondo@...>

[#28591] sub の実行で予期せぬ動作 — Noriyuki Suzuki <noriyuki@...>

[#28594] TkScale#coords, TkScale#get, TkScale#identify 未実装 — Noritsugu Nakamura <nnakamur@...>

[#28599] 1.6 のダウンロードマニュアルが圧縮されていない？ — Keisuke Minami <keisuke@...>

[#28612] TkScrollbar#identify bug — Noritsugu Nakamura <nnakamur@...>

[#28630] nest of Hash.new — Sato Hiroshi <hiroshi@...>

[#28642] substr — Akihiro Yamauchi <aygoofy@...>

[#28646] 指定 field で sort — Kenji Noda <zaq94465a@...>

[#28653] ActiveScriptRuby in ASP — tokoma@... (中川 誠)

[#28660] ruby termios library — akira yamada / やまだあきら <akira@...>

[#28661] 正規表現 — Kenji Noda <zaq94465a@...>

[#28662] TkMenu#insert bug — Noritsugu Nakamura <nnakamur@...>

[#28663] TkMenuClone の使い方は？ — Noritsugu Nakamura <nnakamur@...>

[#28667] TkTextMark#next(index), #previous(index) — Noritsugu Nakamura <nnakamur@...>

[#28680] TkCanvas#delete bug — Noritsugu Nakamura <nnakamur@...>

[#28684] TkCanvas#lower, raise bug — Noritsugu Nakamura <nnakamur@...>

[#28685] Ruby/Tk のメソッドの動作確認スクリプト群 — Noritsugu Nakamura <nnakamur@...>

[#28686] Ruby の求人 — HIGAKI Masaru (ひがき まさる) <mash@...>

[#28687] Re: nest of Hash.new — Takahiro Kambe <taca@...>

[#28691] Dir#glob of mswin32 — "たけ(tk)" <ggb03124@...>

[#28698] ruby のコンパイル — Toru MITANI <toru_m@...2.dion.ne.jp>

[#28703] — HGF01572@...

[#28715] GC — OHARA Shigeki <os@...>

[#28737] Wiki もどき — IWATSUKI Hiroyuki <don@...>

[#28747] Ruby/Gtk 日本語表示と色変更を同時にするには？ — Yoshihisa Yamamoto <yyama@...>

[#28760] tmpfile() に相当するのは？ — 堀川 久 <vzw00011@...>

[#28761] media watch 2001.03.14 — Noritsugu Nakamura <nnakamur@...>

[#28762] CGI::header の不具合 — IWATSUKI Hiroyuki <don@...>

[#28764] Win32_process.create PID — Koga Atsushi <kog@...>

[#28765] Net::FTP#mtime — URA Takefumi <hage@...>

[#28771] copyright of gc.c — TAKAHASHI Masayoshi <maki@...>

[#28773] [Q] ChibiXML のサンプルみたいなもの — eda@...

[#28780] revenge of shell.rb — keiju@... (Keiju ISHITSUKA)

[#28789] freeze した文字列の書き換えチェック方法 — nekurai@...

[#28794] undef singleton method — "K.Kosako" <kosako@...>

[#28798] RubyUnit で、 initialize メソッドのようなことをしたい — "IKAGAWA, Kauztomo" <k_ikagawa@...>

[#28814] fgets — Kazuhiro NISHIYAMA <zn@...>

[#28820] [RDP] cgi.rd — rubikitch <rubikitch@...>

[#28824] [Q] データ格納用の配列の内容が変わる？ — Atsushi Kanaya <todo-a2c@...>

[#28852] Re: [ruby-ext:01642] Re: o_dbm — keiju@... (石塚圭樹)

[#28854] Marshal.load — Masatoshi SEKI <m_seki@...>

[#28855] NetBSD BSD/OS curses — matz@... (Yukihiro Matsumoto)

[#28860] Fwd: [ruby-talk:12840] Looking for a decent compression scheme — Kazuhiro Yoshida <moriq.kazuhiro@...>

[#28862] media watch 2001.03.18 — Noritsugu Nakamura <nnakamur@...>

[#28864] patch glob for MSWin32 ruby-1.6.3 — arton <arton@...>

[#28877] Gtk.timeout_add — Nishio Mizuho <mzh@...>

[#28881] 初歩的な質問 — Kenji Noda <zaq94465a@...>

[#28887] cygwin で組み込み — "shibata kenji" <shibata@...>

[#28895] 1.6.3 compile with cc on Sun or HP-UX. — Takashi Shimizu <simtak@...>

[#28901] Numeric.new — "たけ(tk)" <ggb03124@...>

[#28903] lndir.rb でエラー — みかみ まさと <kofukan@...>

[#28911] media watch 2001.03.22 — akira yamada / やまだあきら <akira@...>

[#28916] ruby 1.6.3, deleted from 1.6.2? — Takahiro Kambe <taca@...>

[#28919] RD の Reference について — Kenta MURATA <muraken2@...>

[#28920] オペレータの再定義 — EMOTO Masahiko <emo@...>

[#28932] class constants and singleton class — "K.Kosako" <kosako@...>

[#28938] yet another URI library — akira yamada / やまだあきら <akira@...>

[#28943] Front End Processror A(?) Ruby — YANAGAWA Kazuhisa <kjana@...>

[#28415] class Real — 正木　功 <GEC01122@...>

[#28431] RE:class Real — 正木　功 <GEC01122@...>

[#28454] Ruby 初心者は！ — 有瀬　和徳 <crush@...>

[#28565] 海外無料サーバ — 有瀬　和徳 <crush@...>

[#28653] ActiveScriptRuby in ASP — tokoma@... (中川誠)

[#28686] Ruby の求人 — HIGAKI Masaru (ひがきまさる) <mash@...>

[#28760] tmpfile() に相当するのは？ — 堀川久 <vzw00011@...>

[#28903] lndir.rb でエラー — みかみまさと <kofukan@...>

[#28963] Re: ９ｐ L ３〜１０ P ２ L 　 2 回目 — Naoto Hiroshima <taisei-in@...>

[#28996] ruby API 　でどのクラスのインスタンスか知りたい — Kengo Nakajima <ringo@...>

[#29044] メソッドを private にしたい — 島田喜郎 <yoshimada@...>

[#29046] Re: メソッドを private にしたい — 島田喜郎 <yoshimada@...>