ultraviolet 0.9.0 → 0.10.0

data/History.txt

@@ -1,3 +1,12 @@
+== 0.10.0 / 2007-05-15
+* Added copy files commant to Uv module and to command line utility.
+  now the required files (ex. css) may be easily copied to a destination
+  directory.
+* Small corrections in html_processor (should change name)
+* Many modifications to latex rendering
+* First latex rendering implementation (still buggy).
+* All processing is defined in render files.
+
 == 0.9.0 / 2007-04-24
 
 * 1 major enhancement

data/Manifest.txt

@@ -1,5 +1,4 @@
 render/old/txt2tags.render
-render/xhtml
 render/xhtml/active4d.render
 render/xhtml/all_hallows_eve.render
 render/xhtml/amy.render
@@ -44,6 +43,27 @@ render/xhtml/files/css/spacecadet.css
 render/xhtml/files/css/sunburst.css
 render/xhtml/files/css/twilight.css
 render/xhtml/files/css/zenburnesque.css
+render/latex/amy.render
+render/latex/espresso_libre.render
+render/latex/eiffel.render
+render/latex/sunburst.render
+render/latex/idle.render
+render/latex/lazy.render
+render/latex/all_hallows_eve.render
+render/latex/blackboard.render
+render/latex/brilliance_dull.render
+render/latex/zenburnesque.render
+render/latex/magicwb_amiga.render
+render/latex/dawn.render
+render/latex/twilight.render
+render/latex/spacecadet.render
+render/latex/brilliance_black.render
+render/latex/mac_classic.render
+render/latex/active4d.render
+render/latex/slush_poppies.render
+render/latex/cobalt.render
+render/latex/iplastic.render
+render/latex/pastels_on_dark.render
 test/test_uv.rb
 lib/uv/html_processor.rb
 lib/uv.rb
@@ -208,7 +228,8 @@ syntax/javascript_+_prototype.syntax
 syntax/languagedefinition.syntax
 syntax/regular_expressions_oniguruma.syntax
 syntax/subversion_commit_message.syntax
-bin/theme2render
+bin/theme2xhtmlrender
+bin/theme2latexrender
 bin/uv
 History.txt
 Rakefile

data/bin/theme2latexrender

@@ -0,0 +1,143 @@
+#! /usr/bin/env ruby
+begin
+   require 'plist'
+rescue LoadError
+   require 'rubygems'
+   require 'plist'
+end
+
+base_dir = File.join( File.dirname(__FILE__), '..', 'render' )
+
+def settings
+   unless @settings
+      @settings = @theme["settings"].find { |s| ! s["name"] }["settings"]
+   end
+   @settings
+end
+
+def normalize_color color
+   if color =~ /^#/ && color.size == 9
+      div0 = (settings["background"] ? settings["background"][1..-1].hex : 0xFFFFFF )
+      div1, alpha = color[1..-1].hex.divmod( 0x100 )
+      result = ""
+      3.times {
+         div0, mod0 = div0.divmod( 0x100 )
+         div1, mod1 = div1.divmod( 0x100 )
+         result = ((mod1 * alpha + mod0 * ( 0x100 - alpha ) ) / 0x100).to_s(16).upcase.rjust(2, '0') + result
+      }
+      result = result
+      result
+   elsif color =~ /^#/ && color.size == 4
+      r = (color[0].hex * 256 / 16).to_s(16).upcase.rjust(2, '0')
+      g = (color[1].hex * 256 / 16).to_s(16).upcase.rjust(2, '0')
+      b = (color[2].hex * 256 / 16).to_s(16).upcase.rjust(2, '0')
+      r + g + b
+   elsif color =~ /^#/ && color.size == 7
+      return color[1..-1]
+   end
+end
+
+@theme = Plist::parse_xml( ARGV[0] )
+render = {"name" => @theme["name"]}
+codecolumn = ""
+numbercolumn = ""
+standard_name = File.basename( ARGV[0] ).downcase.gsub(/\s+/, '_').gsub('.tmtheme', '').gsub(/\W/, '').gsub(/_+/, '_')
+
+render["tags"] = []
+
+@theme["settings"].each do |t|
+   if t["scope"]
+      class_name = t["name"].downcase.gsub(/\W/, ' ').gsub('.tmtheme', '').split(' ').collect{|s| s.capitalize}.join
+      if class_name == ""
+         class_name = "x" * t["name"].size
+      end
+      
+      tag = {}
+      tag["selector"] = t["scope"]
+      render["tags"] << tag
+      
+      begin_string = ""
+      pcount = 0
+      if s = t["settings"]
+         if s["background"]
+            begin_string << "\\colorbox[HTML]{#{normalize_color(s["background"])}}{"
+         else
+            begin_string << "{"
+         end
+         pcount += 1
+         if s["foreground"]
+            begin_string << "\\color[HTML]{#{normalize_color(s["foreground"])}}" 
+         end
+         case s["fontStyle"]
+            when /bold/
+               begin_string << "\\textbf{"
+               pcount += 1
+            when /italic/ 
+               begin_string << "\\textit{"
+               pcount += 1
+            when /underline/ 
+               begin_string << "\\underline{"
+               pcount += 1
+            end
+         tag["begin"] = begin_string
+         tag["end"] = "}" * pcount
+      end
+      
+
+   elsif ! t["name"]
+      if s = t["settings"]
+         codecolumn = "\\newcolumntype{C}{>{"
+         codecolumn << "\\color[HTML]{#{normalize_color(s["foreground"])}}" if s["foreground"]
+         codecolumn << "\\columncolor[HTML]{#{normalize_color(s["background"])}}" if s["background"]
+         codecolumn << "}l}"
+         
+         numbercolumn = "\\newcolumntype{N}{>{"
+         numbercolumn << "\\color[HTML]{#{normalize_color(s["foreground"])}}" if s["foreground"]
+         numbercolumn << "\\columncolor[HTML]{#{normalize_color(s["selection"])}}" if s["selection"]
+         numbercolumn << "}l}"
+         
+         tag = {}
+         tag["begin"] = "\\texttt{"
+         tag["end"] = "}&\\mbox{\\texttt{"
+         render["line-numbers"] = tag      end
+   end
+end
+
+render["filter"] = '@escaped.gsub(/(_|\{|\}|&|\#|\\\\)/, \'\\\\\\\\\1\').gsub(/~/, \'\\\\textasciitilde\').gsub(/ /,\'\\\\hspace{1ex}\').gsub(/\t/,\'\\\\hspace{3ex}\')'
+
+tag = {}
+tag["begin"] = ""
+tag["end"]  = "}}\\\\"
+render["line"] = tag
+
+tag = {}
+tag["begin"] = <<END
+#{codecolumn}
+#{numbercolumn}
+\\begin{longtable}{NC}
+END
+
+tag["end"]   = <<END
+\\end{longtable}
+END
+render["listing"] = tag
+
+tag = {}
+tag["begin"] = <<END
+\\documentclass[a4paper,landscape]{article}
+\\usepackage{xcolor}
+\\usepackage{colortbl}
+\\usepackage{longtable}
+\\usepackage[left=2cm,top=1cm,right=3cm,nohead,nofoot]{geometry}
+\\usepackage[T1]{fontenc}
+\\usepackage[scaled]{beramono}
+\\begin{document}
+END
+
+tag["end"] = <<END
+\\end{document}
+END
+
+render["document"] = tag
+
+File.open( File.join( base_dir, "latex", "#{standard_name}.render" ), "w" ) {|f| YAML.dump( render, f ) }

data/bin/{theme2render → theme2xhtmlrender}

@@ -6,6 +6,8 @@ rescue LoadError
    require 'plist'
 end
 
+base_dir = File.join( File.dirname(__FILE__), '..', 'render' )
+
 
 
 def settings
@@ -26,9 +28,6 @@ def normalize_color color
          result = ((mod1 * alpha + mod0 * ( 0x100 - alpha ) ) / 0x100).to_s(16).upcase.rjust(2, '0') + result
       }
       result = "#" + result
-      #result = "##{ big, small = ; ((big  * (0xFF - small)) / 0xFF).to_s(16).upcase}"
-      #result = "##{ big, small = "0xFFFFFF10".hex.divmod( "0x100".hex); ((big  * small) / 0xFF).to_s(16).upcase}"
-      #result = color[0...-2]
       result
    else
       color
@@ -45,17 +44,17 @@ code_name = "pre.#{standard_name}"
 render["tags"] = []
 @theme["settings"].each do |t|
    if t["scope"]
-      tag = {}
-      tag["selector"] = t["scope"]
       class_name = t["name"].downcase.gsub(/\W/, ' ').gsub('.tmtheme', '').split(' ').collect{|s| s.capitalize}.join
       if class_name == ""
          class_name = "x" * t["name"].size
       end
+      
+      tag = {}
+      tag["selector"] = t["scope"]
       tag["begin"] = "<span class=\"#{class_name}\">"
       tag["end"] = "</span>"
       render["tags"] << tag
       
-      
       if s = t["settings"]
          style = {}
          style["color"] = normalize_color(s["foreground"])
@@ -78,6 +77,7 @@ render["tags"] = []
          style["color"] = normalize_color(s["foreground"])
          style["background-color"] = normalize_color(s["selection"])
          css[".line-numbers"] = style
+         
          tag = {}
          tag["begin"] = "<span class=\"line-numbers\">"
          tag["end"] = "</span>"
@@ -86,9 +86,67 @@ render["tags"] = []
    end
 end
 
-File.open( "#{standard_name}.render", "w" ) {|f| YAML.dump( render, f ) }
+render["filter"] = "CGI.escapeHTML( @escaped )"
+
+tag = {}
+tag["begin"] = ""
+tag["end"]   = ""
+render["line"] = tag
+
+
+tag = {}
+tag["begin"] = "<pre class=\"#{standard_name}\">"
+tag["end"]   = "</pre>"
+render["listing"] = tag
 
-File.open( "#{standard_name}.css", "w" ) do |f|
+tag = {}
+tag["begin"] = <<END
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+  <meta http-equiv="cache-control" content="no-cache" />
+  <meta http-equiv="expires" content="3600" />
+  <meta name="revisit-after" content="2 days" />
+  <meta name="robots" content="index,follow" />
+  <meta name="publisher" content="Dichodaemon" />
+  <meta name="copyright" content="Dichodaemon" />
+
+  <meta name="author" content="Dichodaemon" />
+  <meta name="distribution" content="global" />
+  <meta name="description" content="Ocatarinetabellachithchix" />
+  <meta name="keywords" content="arzaversperia flexilimosos toves" />
+  <link rel="stylesheet" type="text/css" media="screen,projection,print" href="css/#{standard_name}.css" />
+  <title>#{standard_name}</title>
+
+</head>
+
+<body>
+END
+
+tag["end"] = <<END
+  <p>
+    <a href="http://validator.w3.org/check?uri=referer">
+      <img style="border:0"
+           src="http://www.w3.org/Icons/valid-xhtml10"
+           alt="Valid XHTML 1.0 Strict" height="31" width="88" />
+    </a>
+    <a href="http://jigsaw.w3.org/css-validator/check?uri=referer">
+      <img style="border:0;width:88px;height:31px"
+           src="http://jigsaw.w3.org/css-validator/images/vcss" 
+           alt="Valid CSS!" />
+    </a>
+  </p>
+</body>
+</html>
+END
+
+render["document"] = tag
+
+File.open( File.join( base_dir, "xhtml", "#{standard_name}.render" ), "w" ) {|f| YAML.dump( render, f ) }
+
+File.open( File.join( base_dir, "xhtml", "files", "css", "#{standard_name}.css" ), "w" ) do |f|
    css.each do |key, values|
       if key == code_name
          f.puts "#{code_name} {"
@@ -101,4 +159,4 @@ File.open( "#{standard_name}.css", "w" ) do |f|
       end
       f.puts "}"
    end
-end
+end

data/bin/uv

@@ -12,16 +12,21 @@ require 'optparse'
 require 'ostruct'
 
 o = OpenStruct.new
+o.copy_files = false 
+o.output = "xhtml"
+o.headers = false
+o.theme = "espresso_libre"
 
 options = OptionParser.new
 
-options.banner =<<END 
+options.banner =<<END
 
 Usage: uv [options] input_file
 
-Parses input_file and outputs the coresponding HTML to stdout.
-If no syntax is specified, it tries to guess the best one.
-If no theme is specified, defaults to espresso_libre.
+Parses input_file (or stdin, if no input_file is given) and 
+outputs the coresponding HTML to stdout. If no syntax is specified, 
+it tries to guess the best one. If no theme is specified, defaults 
+to espresso_libre.
 
 Example:
 
@@ -36,10 +41,18 @@ Options:
 
 END
 
+options.on( "-c DIR", "--copy-files DIR", <<DESCRIPTION ) {|val| o.copy_files = val}
+Copy the required files to the specified output directory (css, images, etc).
+DESCRIPTION
+
 options.on( "-s SYNTAX", "--syntax SYNTAX", <<DESCRIPTION, Uv.syntaxes) {|val| o.syntax = val}
 The file's syntax (e.g. ruby, c++, etc.) 
 DESCRIPTION
 
+options.on( "-o OUTPUT", "--output OUTPUT", <<DESCRIPTION) {|val| o.output = val}
+The output format (xhtml, latex, etc.) default to xhtml
+DESCRIPTION
+
 options.on( "-t THEME", "--theme THEME", <<DESCRIPTION, Uv.themes) {|val| o.theme = val}
 The theme to be used (e.g. amy, espresso_libre, etc.)
 DESCRIPTION
@@ -50,7 +63,7 @@ DESCRIPTION
 
 
 options.on( "-h", "--headers", <<DESCRIPTION ) {|val| o.headers = val}
-Include headers, outputs a self-contained web page
+Include headers, outputs a self-contained web page/document
 DESCRIPTION
 
 options.on( "-d", "--debug", <<DESCRIPTION ) {|val| o.debug = val}
@@ -85,6 +98,14 @@ elsif o.list
    exit
 end
 
+if o.copy_files
+   unless File.exists?(o.copy_files)
+      STDERR.puts "The specified output directory: #{o.copy_files} does not exist."
+      exit -1
+   end
+   Uv.copy_files o.output, o.copy_files
+end
+
 o.filename = rest[0]
 
 if o.filename && ! o.syntax
@@ -95,7 +116,7 @@ if o.filename && ! o.syntax
       candidates.sort.each { |name, syntax| STDERR.puts "\t - " + name}
       exit -1
    end
-   o.syntax = candidates.first.first
+   o.syntax = candidates.first.first unless candidates.size == 0
 end
 
 unless o.syntax
@@ -114,49 +135,5 @@ if o.debug
    exit
 end
 
-o.theme ||= "espresso_libre"
-o.stylesheet = "#{o.theme}.css"
+puts Uv.parse( o.text, o.output,  o.syntax, ! o.lines, o.theme, o.headers )
 
-puts <<END
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
-
-<head>
-  <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="cache-control" content="no-cache" />
-  <meta http-equiv="expires" content="3600" />
-  <meta name="revisit-after" content="2 days" />
-  <meta name="robots" content="index,follow" />
-  <meta name="publisher" content="Dichodaemon" />
-  <meta name="copyright" content="Dichodaemon" />
-
-  <meta name="author" content="Dichodaemon" />
-  <meta name="distribution" content="global" />
-  <meta name="description" content="Ocatarinetabellachithchix" />
-  <meta name="keywords" content="arzaversperia flexilimosos toves" />
-  <link rel="stylesheet" type="text/css" media="screen,projection,print" href="css/#{o.stylesheet}" />
-  <title>#{o.theme}</title>
-
-</head>
-
-<body>
-END
-
-puts Uv.parse( o.text, "xhtml",  o.syntax, ! o.lines, o.theme )
-
-puts <<END
-  <p>
-    <a href="http://validator.w3.org/check?uri=referer">
-      <img style="border:0"
-           src="http://www.w3.org/Icons/valid-xhtml10"
-           alt="Valid XHTML 1.0 Strict" height="31" width="88" />
-    </a>
-    <a href="http://jigsaw.w3.org/css-validator/check?uri=referer">
-      <img style="border:0;width:88px;height:31px"
-           src="http://jigsaw.w3.org/css-validator/images/vcss" 
-           alt="Valid CSS!" />
-    </a>
-  </p>
-</body>
-</html>
-END

data/lib/uv.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 require 'textpow'
 require 'uv/html_processor.rb'
 
@@ -8,6 +9,13 @@ module Uv
       result = []
       result << File.join(File.dirname(__FILE__), ".." )   
    end
+   
+   def Uv.copy_files output, output_dir
+      Uv.path.each do |dir|
+         dir_name = File.join( dir, "render", output, "files" )
+         FileUtils.cp_r( Dir.glob(File.join( dir_name, "." )), output_dir ) if File.exists?( dir_name )
+      end
+   end
 
    def Uv.init_syntaxes
       @syntaxes = {}
@@ -15,7 +23,7 @@ module Uv
          @syntaxes[File.basename(f, '.syntax')] = Textpow::SyntaxNode.load( f )
       end
    end
-   
+
    def Uv.syntaxes
       Dir.glob( File.join(File.dirname(__FILE__), '..', 'syntax', '*.syntax') ).collect do |f| 
          File.basename(f, '.syntax')
@@ -55,18 +63,15 @@ module Uv
       result
    end
    
-   def Uv.parse text, output = "xhtml", syntax_name = nil, line_numbers = false, render_style = "classic"
+   def Uv.parse text, output = "xhtml", syntax_name = nil, line_numbers = false, render_style = "classic", headers = false
       init_syntaxes unless @syntaxes
       renderer = File.join( File.dirname(__FILE__), '..',"render", output,"#{render_style}.render")
+      raise( ArgumentError, "Output for #{output} is not yet implemented" ) unless File.exists?(renderer)
       css_class = render_style
       render_options = YAML.load( File.open(  renderer ) )
-      if output == "xhtml"
-         render_processor = HtmlProcessor.new( render_options, line_numbers )
-         @syntaxes[syntax_name].parse( text,  render_processor )
-         "<pre class =\"#{css_class}\">#{render_processor.string}</pre>"
-      else
-         raise( ArgumentError, "Output for #{output} is not yet implemented" )
-      end
+      render_processor = HtmlProcessor.new( render_options, line_numbers, headers )
+      @syntaxes[syntax_name].parse( text,  render_processor )
+      render_processor.string
    end
 
    def Uv.debug text, syntax_name