[前][次][番号順一覧][スレッド一覧]

ruby-changes:3607

From: ko1@a...
Date: Fri, 18 Jan 2008 04:29:33 +0900 (JST)
Subject: [ruby-changes:3607] drbrain - Ruby:r15096 (trunk): Fix namespacing

drbrain	2008-01-18 04:29:16 +0900 (Fri, 18 Jan 2008)

  New Revision: 15096

  Modified files:
    trunk/ChangeLog
    trunk/lib/rdoc/markup/to_latex.rb
    trunk/sample/rdoc/markup/rdoc2latex.rb

  Log:
    Fix namespacing

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15096&r2=15095&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/sample/rdoc/markup/rdoc2latex.rb?r1=15096&r2=15095&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/rdoc/markup/to_latex.rb?r1=15096&r2=15095&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15095)
+++ ChangeLog	(revision 15096)
@@ -1,3 +1,9 @@
+Fri Jan 18 04:27:57 2008  Eric Hodel  <drbrain@s...>
+
+	* sample/rdoc/markup/rdoc2latex.rb:  Fix for new namespacing.
+
+	* lib/rdoc/markup/to_latex.rb:  Fix namespacing.
+
 Fri Jan 18 02:02:28 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* bootstraptest/runner.rb (assert_valid_syntax): added.
Index: sample/rdoc/markup/rdoc2latex.rb
===================================================================
--- sample/rdoc/markup/rdoc2latex.rb	(revision 15095)
+++ sample/rdoc/markup/rdoc2latex.rb	(revision 15096)
@@ -1,12 +1,11 @@
 #!/usr/local/bin/ruby
-# Illustration of a script to convert an RDoc-style file to a LaTeX
-# document
+# Illustration of a script to convert an RDoc-style file to a LaTeX document
 
-require 'rdoc/markup/simple_markup'
-require 'rdoc/markup/simple_markup/to_latex'
+require 'rdoc/markup'
+require 'rdoc/markup/to_latex'
 
-p = SM::SimpleMarkup.new
-h = SM::ToLaTeX.new
+p = RDoc::Markup.new
+h = RDoc::Markup::ToLaTeX.new
 
 #puts "\\documentclass{report}"
 #puts "\\usepackage{tabularx}"
Index: lib/rdoc/markup/to_latex.rb
===================================================================
--- lib/rdoc/markup/to_latex.rb	(revision 15095)
+++ lib/rdoc/markup/to_latex.rb	(revision 15096)
@@ -29,13 +29,13 @@
   end
 
   LIST_TYPE_TO_LATEX = {
-    ListBase::BULLET =>  [ l("\\begin{itemize}"), l("\\end{itemize}") ],
-    ListBase::NUMBER =>  [ l("\\begin{enumerate}"), l("\\end{enumerate}"), "\\arabic" ],
-    ListBase::UPPERALPHA =>  [ l("\\begin{enumerate}"), l("\\end{enumerate}"), "\\Alph" ],
-    ListBase::LOWERALPHA =>  [ l("\\begin{enumerate}"), l("\\end{enumerate}"), "\\alph" ],
-    ListBase::LABELED => [ l("\\begin{description}"), l("\\end{description}") ],
-    ListBase::NOTE    => [
-      l("\\begin{tabularx}{\\linewidth}{@{} l X @{}}"), 
+    RDoc::Markup::ListBase::BULLET =>  [ l("\\begin{itemize}"), l("\\end{itemize}") ],
+    RDoc::Markup::ListBase::NUMBER =>  [ l("\\begin{enumerate}"), l("\\end{enumerate}"), "\\arabic" ],
+    RDoc::Markup::ListBase::UPPERALPHA =>  [ l("\\begin{enumerate}"), l("\\end{enumerate}"), "\\Alph" ],
+    RDoc::Markup::ListBase::LOWERALPHA =>  [ l("\\begin{enumerate}"), l("\\end{enumerate}"), "\\alph" ],
+    RDoc::Markup::ListBase::LABELED => [ l("\\begin{description}"), l("\\end{description}") ],
+    RDoc::Markup::ListBase::NOTE    => [
+      l("\\begin{tabularx}{\\linewidth}{@{} l X @{}}"),
       l("\\end{tabularx}") ],
   }
 
@@ -62,7 +62,7 @@
   # Escape a LaTeX string
 
   def escape(str)
-$stderr.print "FE: ", str
+    $stderr.print "FE: ", str if $DEBUG_RDOC
     s = str.
        sub(/\s+$/, '').
       gsub(/([_\${}&%#])/, "#{BS}\\1").
@@ -73,7 +73,7 @@
       gsub(/>/,  GREATERTHAN).
       gsub(/,,/, ",{},").
       gsub(/\`/,  BACKQUOTE)
-$stderr.print "-> ", s, "\n"
+    $stderr.print "-> ", s, "\n" if $DEBUG_RDOC
     s
   end
 
@@ -202,7 +202,7 @@
     flow.each do |item|
       case item
       when String
-         $stderr.puts "Converting '#{item}'"
+        $stderr.puts "Converting '#{item}'" if $DEBUG_RDOC
         res << convert_string(item)
       when AttrChanger
         off_tags(res, item)
@@ -299,14 +299,15 @@
 
   def list_item_start(am, fragment)
     case fragment.type
-    when ListBase::BULLET, ListBase::NUMBER, ListBase::UPPERALPHA,
-         ListBase::LOWERALPHA
+    when RDoc::Markup::ListBase::BULLET, RDoc::Markup::ListBase::NUMBER,
+         RDoc::Markup::ListBase::UPPERALPHA,
+         RDoc::Markup::ListBase::LOWERALPHA then
       "\\item "
 
-    when ListBase::LABELED
+    when RDoc::Markup::ListBase::LABELED then
       "\\item[" + convert_flow(am.flow(fragment.param)) + "] "
 
-    when ListBase::NOTE
+    when RDoc::Markup::ListBase::NOTE then
         convert_flow(am.flow(fragment.param)) + " & "
     else
       raise "Invalid list type"
@@ -315,10 +316,13 @@
 
   def list_end_for(fragment_type)
     case fragment_type
-    when ListBase::BULLET, ListBase::NUMBER, ListBase::UPPERALPHA,
-         ListBase::LOWERALPHA, ListBase::LABELED
+    when RDoc::Markup::ListBase::BULLET,
+         RDoc::Markup::ListBase::NUMBER,
+         RDoc::Markup::ListBase::UPPERALPHA,
+         RDoc::Markup::ListBase::LOWERALPHA,
+         RDoc::Markup::ListBase::LABELED then
       ""
-    when ListBase::NOTE
+    when RDoc::Markup::ListBase::NOTE
       "\\\\\n"
     else
       raise "Invalid list type"
@@ -327,5 +331,3 @@
 
 end
 
-d
-

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]