ultraviolet 0.10.0 → 0.10.1

data/History.txt

@@ -1,3 +1,10 @@
+== 0.10.1 / 2007-06-15
+* Corrected line-number schemes in theme2xhtmlrender
+* Corrected alpha blending code in theme2xhtmlrender, Now the brilliance themes seem to work!
+* Modified html_processor to include whole syntax scopes.
+* Add index for duplicated setting names in tmTheme files.
+* Multiple fixes for latex, color boxes have now the right color and size.
+
 == 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

data/Manifest.txt

@@ -1,237 +1,233 @@
-render/old/txt2tags.render
-render/xhtml/active4d.render
-render/xhtml/all_hallows_eve.render
-render/xhtml/amy.render
-render/xhtml/brilliance_black.render
-render/xhtml/brilliance_dull.render
-render/xhtml/cobalt.render
-render/xhtml/eiffel.render
-render/xhtml/espresso_libre.render
-render/xhtml/idle.render
-render/xhtml/iplastic.render
-render/xhtml/lazy.render
-render/xhtml/mac_classic.render
-render/xhtml/magicwb_amiga.render
-render/xhtml/pastels_on_dark.render
-render/xhtml/slush_poppies.render
-render/xhtml/spacecadet.render
-render/xhtml/sunburst.render
-render/xhtml/twilight.render
-render/xhtml/blackboard.render
-render/xhtml/dawn.render
-render/xhtml/zenburnesque.render
-render/xhtml/files
-render/xhtml/files/css
-render/xhtml/files/css/active4d.css
-render/xhtml/files/css/all_hallows_eve.css
-render/xhtml/files/css/amy.css
+test/test_uv.rb
+lib/uv/render_processor.rb
+lib/uv/utility.rb
+lib/uv.rb
+bin/theme2xhtmlrender
+bin/theme2latexrender
+bin/uv
+History.txt
+Rakefile
+Manifest.txt
+README.txt
+render/xhtml/files/css/idle.css
+render/xhtml/files/css/lazy.css
+render/xhtml/files/css/espresso_libre.css
 render/xhtml/files/css/blackboard.css
-render/xhtml/files/css/brilliance_black.css
 render/xhtml/files/css/brilliance_dull.css
-render/xhtml/files/css/cobalt.css
+render/xhtml/files/css/sunburst.css
+render/xhtml/files/css/amy.css
+render/xhtml/files/css/zenburnesque.css
+render/xhtml/files/css/magicwb_amiga.css
 render/xhtml/files/css/dawn.css
 render/xhtml/files/css/eiffel.css
-render/xhtml/files/css/espresso_libre.css
-render/xhtml/files/css/idle.css
-render/xhtml/files/css/iplastic.css
-render/xhtml/files/css/lazy.css
+render/xhtml/files/css/twilight.css
+render/xhtml/files/css/spacecadet.css
+render/xhtml/files/css/brilliance_black.css
 render/xhtml/files/css/mac_classic.css
-render/xhtml/files/css/magicwb_amiga.css
-render/xhtml/files/css/pastels_on_dark.css
+render/xhtml/files/css/active4d.css
 render/xhtml/files/css/slush_poppies.css
-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/xhtml/files/css/cobalt.css
+render/xhtml/files/css/iplastic.css
+render/xhtml/files/css/all_hallows_eve.css
+render/xhtml/files/css/pastels_on_dark.css
+render/xhtml/idle.render
+render/xhtml/lazy.render
+render/xhtml/espresso_libre.render
+render/xhtml/blackboard.render
+render/xhtml/brilliance_dull.render
+render/xhtml/sunburst.render
+render/xhtml/amy.render
+render/xhtml/zenburnesque.render
+render/xhtml/magicwb_amiga.render
+render/xhtml/dawn.render
+render/xhtml/eiffel.render
+render/xhtml/twilight.render
+render/xhtml/spacecadet.render
+render/xhtml/brilliance_black.render
+render/xhtml/mac_classic.render
+render/xhtml/active4d.render
+render/xhtml/slush_poppies.render
+render/xhtml/cobalt.render
+render/xhtml/iplastic.render
+render/xhtml/all_hallows_eve.render
+render/xhtml/pastels_on_dark.render
+render/latex/mac_classic.render
+render/latex/active4d.render
+render/latex/cobalt.render
+render/latex/magicwb_amiga.render
+render/latex/pastels_on_dark.render
+render/latex/iplastic.render
 render/latex/idle.render
 render/latex/lazy.render
-render/latex/all_hallows_eve.render
-render/latex/blackboard.render
+render/latex/espresso_libre.render
 render/latex/brilliance_dull.render
+render/latex/blackboard.render
+render/latex/sunburst.render
+render/latex/amy.render
 render/latex/zenburnesque.render
-render/latex/magicwb_amiga.render
 render/latex/dawn.render
+render/latex/eiffel.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
-syntax/old
-syntax/old/txt2tags.yaml
-syntax/old/YAML.yaml
-syntax/buggy
-syntax/buggy/nemerle.yaml
-syntax/gtd2_text.syntax
-syntax/multimarkdown.syntax
-syntax/asp.syntax
-syntax/active4d_ini.syntax
-syntax/sweave.syntax
-syntax/xsl.syntax
+render/latex/brilliance_black.render
+render/latex/all_hallows_eve.render
+render/old/txt2tags.render
+syntax/logo.syntax
+syntax/dylan.syntax
+syntax/latex_log.syntax
+syntax/textile.syntax
+syntax/build.syntax
+syntax/latex_memoir.syntax
+syntax/lexflex.syntax
+syntax/lisp.syntax
+syntax/gtd.syntax
+syntax/m.syntax
 syntax/ocaml.syntax
 syntax/d.syntax
-syntax/ruby_on_rails.syntax
-syntax/standard_ml.syntax
-syntax/r.syntax
-syntax/gri.syntax
+syntax/cm.syntax
+syntax/ocamlyacc.syntax
+syntax/opengl.syntax
+syntax/pascal.syntax
+syntax/lua.syntax
+syntax/active4d.syntax
 syntax/mel.syntax
-syntax/javascript_+_prototype_bracketed.syntax
-syntax/lighttpd.syntax
-syntax/blog_text.syntax
-syntax/m.syntax
-syntax/tcl.syntax
-syntax/textile.syntax
-syntax/build.syntax
+syntax/r.syntax
+syntax/r_console.syntax
+syntax/smarty.syntax
+syntax/latex.syntax
+syntax/prolog.syntax
+syntax/rez.syntax
+syntax/asp.syntax
 syntax/xhtml_1.0.syntax
+syntax/icalendar.syntax
+syntax/mootools.syntax
+syntax/scheme.syntax
 syntax/xml.syntax
-syntax/latex_log.syntax
-syntax/lisp.syntax
-syntax/rez.syntax
-syntax/logo.syntax
-syntax/ocamllex.syntax
+syntax/mail.syntax
+syntax/swig.syntax
 syntax/slate.syntax
-syntax/ruby.syntax
-syntax/s5.syntax
-syntax/php.syntax
+syntax/sweave.syntax
 syntax/qmake_project.syntax
-syntax/ocamlyacc.syntax
+syntax/release_notes.syntax
+syntax/html_tcl.syntax
+syntax/html.syntax
+syntax/c.syntax
+syntax/pmwiki.syntax
+syntax/ruby.syntax
 syntax/csv.syntax
+syntax/ruby_on_rails.syntax
+syntax/xsl.syntax
 syntax/yaml.syntax
-syntax/scheme.syntax
-syntax/python.syntax
-syntax/ragel.syntax
-syntax/haml.syntax
-syntax/objective-c.syntax
+syntax/io.syntax
+syntax/java.syntax
+syntax/gri.syntax
+syntax/movable_type.syntax
 syntax/cs.syntax
-syntax/moinmoin.syntax
-syntax/mootools.syntax
 syntax/css.syntax
-syntax/dot.syntax
 syntax/c++.syntax
-syntax/strings_file.syntax
-syntax/objective-c++.syntax
-syntax/javascript.syntax
-syntax/jquery_javascript.syntax
-syntax/json.syntax
-syntax/latex.syntax
-syntax/prolog.syntax
-syntax/regexp.syntax
-syntax/remind.syntax
-syntax/sql.syntax
-syntax/mediawiki.syntax
+syntax/haml.syntax
+syntax/dot.syntax
+syntax/tsv.syntax
+syntax/ruby_experimental.syntax
+syntax/man.syntax
+syntax/bibtex.syntax
+syntax/objective-c.syntax
+syntax/subversion_commit_message.syntax
+syntax/ocamllex.syntax
+syntax/tcl.syntax
+syntax/tex.syntax
+syntax/ragel.syntax
+syntax/shell-unix-generic.syntax
 syntax/inform.syntax
-syntax/pascal.syntax
-syntax/c.syntax
-syntax/blog_textile.syntax
-syntax/html.syntax
-syntax/ini.syntax
-syntax/ada.syntax
-syntax/context_free.syntax
-syntax/lexflex.syntax
+syntax/sql.syntax
+syntax/python.syntax
+syntax/modula-3.syntax
 syntax/cake.syntax
-syntax/swig.syntax
-syntax/tex.syntax
-syntax/bulletin_board.syntax
-syntax/rd_r_documentation.syntax
-syntax/html-asp.syntax
-syntax/html_for_asp.net.syntax
+syntax/logtalk.syntax
+syntax/ini.syntax
+syntax/diff.syntax
+syntax/fortran.syntax
 syntax/txt2tags.syntax
-syntax/tex_math.syntax
-syntax/latex_beamer.syntax
-syntax/html_tcl.syntax
-syntax/bibtex.syntax
-syntax/lua.syntax
-syntax/smarty.syntax
-syntax/perl.syntax
-syntax/io.syntax
-syntax/latex_memoir.syntax
-syntax/mod_perl.syntax
-syntax/sql_rails.syntax
-syntax/java.syntax
-syntax/tsv.syntax
-syntax/qt_c++.syntax
-syntax/man.syntax
+syntax/s5.syntax
 syntax/scilab.syntax
+syntax/mips.syntax
+syntax/twiki.syntax
+syntax/perl.syntax
+syntax/fxscript.syntax
+syntax/markdown.syntax
 syntax/lilypond.syntax
-syntax/template_toolkit.syntax
-syntax/html_django.syntax
+syntax/blog_html.syntax
+syntax/html_mason.syntax
+syntax/jquery_javascript.syntax
+syntax/json.syntax
+syntax/languagedefinition.syntax
+syntax/tex_math.syntax
+syntax/xml_strict.syntax
+syntax/php.syntax
+syntax/doxygen.syntax
+syntax/strings_file.syntax
+syntax/makefile.syntax
+syntax/setext.syntax
+syntax/ada.syntax
+syntax/active4d_ini.syntax
+syntax/active4d_library.syntax
 syntax/antlr.syntax
-syntax/fortran.syntax
+syntax/javascript_+_prototype.syntax
+syntax/lighttpd.syntax
+syntax/template_toolkit.syntax
+syntax/sql_rails.syntax
+syntax/ssh-config.syntax
+syntax/mediawiki.syntax
+syntax/moinmoin.syntax
+syntax/javascript.syntax
+syntax/quake3_config.syntax
+syntax/qt_c++.syntax
+syntax/camlp4.syntax
+syntax/multimarkdown.syntax
+syntax/blog_text.syntax
+syntax/blog_textile.syntax
+syntax/bulletin_board.syntax
+syntax/groovy.syntax
+syntax/gtdalt.syntax
+syntax/regular_expressions_python.syntax
+syntax/latex_beamer.syntax
+syntax/remind.syntax
+syntax/regexp.syntax
+syntax/rd_r_documentation.syntax
+syntax/standard_ml.syntax
+syntax/literate_haskell.syntax
+syntax/python_django.syntax
 syntax/restructuredtext.syntax
-syntax/mail.syntax
-syntax/makefile.syntax
-syntax/twiki.syntax
-syntax/active4d.syntax
-syntax/html_mason.syntax
-syntax/release_notes.syntax
-syntax/mips.syntax
+syntax/mod_perl.syntax
+syntax/coldfusion.syntax
+syntax/installer_distribution_script.syntax
 syntax/vectorscript.syntax
-syntax/logtalk.syntax
-syntax/r_console.syntax
-syntax/literate_haskell.syntax
 syntax/macports_portfile.syntax
-syntax/markdown.syntax
-syntax/regular_expressions_python.syntax
-syntax/groovy.syntax
-syntax/setext.syntax
-syntax/opengl.syntax
-syntax/diff.syntax
-syntax/modula-3.syntax
-syntax/icalendar.syntax
-syntax/apache.syntax
-syntax/gtdalt.syntax
-syntax/dylan.syntax
-syntax/xml_strict.syntax
 syntax/yui_javascript.syntax
-syntax/javaproperties.syntax
-syntax/python_django.syntax
-syntax/movable_type.syntax
-syntax/quake3_config.syntax
-syntax/ruby_experimental.syntax
-syntax/shell-unix-generic.syntax
-syntax/postscript.syntax
-syntax/plain_text.syntax
-syntax/ssh-config.syntax
-syntax/processing.syntax
-syntax/property_list.syntax
 syntax/actionscript.syntax
 syntax/active4d_html.syntax
-syntax/active4d_library.syntax
+syntax/apache.syntax
 syntax/applescript.syntax
 syntax/asp_vb.net.syntax
-syntax/blog_html.syntax
 syntax/blog_markdown.syntax
-syntax/camlp4.syntax
-syntax/coldfusion.syntax
+syntax/context_free.syntax
 syntax/css_experimental.syntax
 syntax/dokuwiki.syntax
-syntax/doxygen.syntax
 syntax/eiffel.syntax
 syntax/erlang.syntax
 syntax/f-script.syntax
-syntax/fxscript.syntax
-syntax/greasemonkey.syntax
 syntax/haskell.syntax
+syntax/greasemonkey.syntax
+syntax/html-asp.syntax
+syntax/html_django.syntax
+syntax/html_for_asp.net.syntax
 syntax/html_rails.syntax
-syntax/installer_distribution_script.syntax
-syntax/javascript_+_prototype.syntax
-syntax/languagedefinition.syntax
+syntax/javaproperties.syntax
+syntax/javascript_+_prototype_bracketed.syntax
+syntax/objective-c++.syntax
+syntax/plain_text.syntax
+syntax/postscript.syntax
+syntax/processing.syntax
+syntax/property_list.syntax
 syntax/regular_expressions_oniguruma.syntax
-syntax/subversion_commit_message.syntax
-bin/theme2xhtmlrender
-bin/theme2latexrender
-bin/uv
-History.txt
-Rakefile
-Manifest.txt
-README.txt

data/Rakefile

@@ -25,7 +25,7 @@ begin
       p.url = 'http://ultraviolet.rubyforge.org'
       p.rdoc_pattern = /^(lib|bin|ext)|txt$/
       p.changes = p.paragraphs_of('History.txt', 0).join("\n\n")
-      p.extra_deps << ['textpow', '>= 0.9.0']
+      p.extra_deps << ['textpow', '>= 0.10.0']
       p.clean_globs = ["manual/*"]
    end
    
@@ -48,4 +48,4 @@ rescue LoadError => e
    task :test do
       system "ruby -Ibin:lib:test test_#{rubyforge_name}.rb"
    end
-end
+end

data/bin/theme2latexrender

@@ -5,6 +5,7 @@ rescue LoadError
    require 'rubygems'
    require 'plist'
 end
+require 'uv/utility'
 
 base_dir = File.join( File.dirname(__FILE__), '..', 'render' )
 
@@ -15,28 +16,6 @@ def settings
    @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 = ""
@@ -60,13 +39,13 @@ render["tags"] = []
       pcount = 0
       if s = t["settings"]
          if s["background"]
-            begin_string << "\\colorbox[HTML]{#{normalize_color(s["background"])}}{"
+            begin_string << "\\setlength{\\fboxsep}{0ex}\\colorbox[HTML]{#{Uv.normalize_color(settings, s["background"])[1..-1]}}{\\rule[-0.5ex]{0pt}{2.0ex}"
          else
             begin_string << "{"
          end
          pcount += 1
          if s["foreground"]
-            begin_string << "\\color[HTML]{#{normalize_color(s["foreground"])}}" 
+            begin_string << "\\color[HTML]{#{Uv.normalize_color(settings, s["foreground"], true)[1..-1]}}" 
          end
          case s["fontStyle"]
             when /bold/
@@ -87,13 +66,13 @@ render["tags"] = []
    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 << "\\color[HTML]{#{Uv.normalize_color(settings, s["foreground"], true)[1..-1]}}" if s["foreground"]
+         codecolumn << "\\columncolor[HTML]{#{Uv.alpha_blend(s["background"], s["background"])[1..-1]}}" if s["background"]
          codecolumn << "}l}"
-         
+         bg = Uv.alpha_blend(s["selection"], s["selection"]) if s["selection"]
          numbercolumn = "\\newcolumntype{N}{>{"
-         numbercolumn << "\\color[HTML]{#{normalize_color(s["foreground"])}}" if s["foreground"]
-         numbercolumn << "\\columncolor[HTML]{#{normalize_color(s["selection"])}}" if s["selection"]
+         numbercolumn << "\\color[HTML]{#{Uv.foreground(bg)[1..-1]}}" if bg
+         numbercolumn << "\\columncolor[HTML]{#{bg[1..-1]}}" if s["selection"]
          numbercolumn << "}l}"
          
          tag = {}
@@ -103,7 +82,7 @@ render["tags"] = []
    end
 end
 
-render["filter"] = '@escaped.gsub(/(_|\{|\}|&|\#|\\\\)/, \'\\\\\\\\\1\').gsub(/~/, \'\\\\textasciitilde\').gsub(/ /,\'\\\\hspace{1ex}\').gsub(/\t/,\'\\\\hspace{3ex}\')'
+render["filter"] = '@escaped.gsub(/(\$)/, \'\\\\\\\\\1\').gsub(/\\\\(?!\$)/, \'$\\\\\\\\backslash$\').gsub(/(_|\{|\}|&|\#|%)/, \'\\\\\\\\\1\').gsub(/~/, \'\\\\textasciitilde \').gsub(/ /,\'\\\\hspace{1ex}\').gsub(/\t| /,\'\\\\hspace{3ex}\').gsub(/\"/, "\'\'").gsub(/(\^)/,\'\\\\\\\\\1{}\')'
 
 tag = {}
 tag["begin"] = ""