ultraviolet 0.10.0 → 0.10.1

data/bin/theme2xhtmlrender

@@ -5,11 +5,11 @@ rescue LoadError
    require 'rubygems'
    require 'plist'
 end
+require 'uv/utility'
 
 base_dir = File.join( File.dirname(__FILE__), '..', 'render' )
 
 
-
 def settings
    unless @settings
       @settings = @theme["settings"].find { |s| ! s["name"] }["settings"]
@@ -17,22 +17,7 @@ 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
-   else
-      color
-   end
-end
+puts "Processing #{ARGV[0]}"
 
 @theme = Plist::parse_xml( ARGV[0] )
 render = {"name" => @theme["name"]}
@@ -42,6 +27,7 @@ standard_name = File.basename( ARGV[0] ).downcase.gsub(/\s+/, '_').gsub('.tmthem
 code_name = "pre.#{standard_name}"
 
 render["tags"] = []
+count_names = {}
 @theme["settings"].each do |t|
    if t["scope"]
       class_name = t["name"].downcase.gsub(/\W/, ' ').gsub('.tmtheme', '').split(' ').collect{|s| s.capitalize}.join
@@ -49,6 +35,14 @@ render["tags"] = []
          class_name = "x" * t["name"].size
       end
       
+      if count_names[class_name]
+         tname = class_name
+         class_name = "#{class_name}#{count_names[class_name]}"
+         count_names[tname] += count_names[tname] + 1
+      else
+         count_names[class_name] = 1
+      end
+      
       tag = {}
       tag["selector"] = t["scope"]
       tag["begin"] = "<span class=\"#{class_name}\">"
@@ -57,8 +51,8 @@ render["tags"] = []
       
       if s = t["settings"]
          style = {}
-         style["color"] = normalize_color(s["foreground"])
-         style["background-color"] = normalize_color(s["background"])
+         style["color"] = Uv.normalize_color(settings, s["foreground"], true)
+         style["background-color"] = Uv.normalize_color(settings, s["background"])
          case s["fontStyle"]
             when /bold/ then style["font-weight"] = "bold"
             when /italic/ then style["font-style"] = "italic"
@@ -69,13 +63,13 @@ render["tags"] = []
    elsif ! t["name"]
       if s = t["settings"]
          style = {}
-         style["color"] = normalize_color(s["foreground"])
-         style["background-color"] = normalize_color(s["background"])
+         style["color"] = Uv.normalize_color(settings, s["foreground"], true)
+         style["background-color"] = Uv.alpha_blend(s["background"], s["background"])
          css[code_name] = style
          @style = style
          style = {}
-         style["color"] = normalize_color(s["foreground"])
-         style["background-color"] = normalize_color(s["selection"])
+         style["background-color"] = Uv.alpha_blend(s["selection"], s["selection"])
+         style["color"] = Uv.foreground( style["background-color"] )
          css[".line-numbers"] = style
          
          tag = {}

data/lib/uv.rb

@@ -1,6 +1,6 @@
 require 'fileutils'
 require 'textpow'
-require 'uv/html_processor.rb'
+require 'uv/render_processor.rb'
 
 
 module Uv
@@ -69,7 +69,7 @@ module Uv
       raise( ArgumentError, "Output for #{output} is not yet implemented" ) unless File.exists?(renderer)
       css_class = render_style
       render_options = YAML.load( File.open(  renderer ) )
-      render_processor = HtmlProcessor.new( render_options, line_numbers, headers )
+      render_processor = RenderProcessor.new( render_options, line_numbers, headers )
       @syntaxes[syntax_name].parse( text,  render_processor )
       render_processor.string
    end

data/lib/uv/{html_processor.rb → render_processor.rb}

@@ -3,7 +3,7 @@ require 'cgi'
 module Uv   
    
 
-   class HtmlProcessor
+   class RenderProcessor
       @@score_manager = Textpow::ScoreManager.new
       
       attr_reader :string
@@ -18,13 +18,15 @@ module Uv
          @escapeHTML = true
       end
       
-      def start_parsing
-         @stack = []
+      def start_parsing name
+         @stack = [name]
          @string = ""
          @line = nil
          @line_number = 0
          print @render_options["document"]["begin"] if @headers
          print @render_options["listing"]["begin"]
+#         opt = options @stack
+#         print opt["begin"] if opt
       end
       
       def print string
@@ -45,21 +47,41 @@ module Uv
          @stack << name
          print escape(@line[@position...position].gsub(/\n|\r/, '')) if position > @position
          @position = position
-         opt = options
+         opt = options @stack
          print opt["begin"] if opt
       end
       
       def close_tag name, position
          print escape(@line[@position...position].gsub(/\n|\r/, '')) if position > @position
          @position = position
-         opt = options
+         opt = options @stack
          print opt["end"] if opt
          @stack.pop
       end
       
+      def close_line
+         stack = @stack[0..-1]
+         while stack.size > 1
+            opt = options stack
+            print opt["end"] if opt
+            stack.pop
+         end
+      end
+      
+      def open_line
+         stack = [@stack.first]
+         clone = @stack[1..-1]
+         while stack.size < @stack.size
+            stack << clone.shift
+            opt = options stack
+            print opt["begin"] if opt
+         end
+      end
+      
       def new_line line
          if @line
             print escape(@line[@position..-1].gsub(/\n|\r/, ''))
+            close_line
             print @render_options["line"]["end"]
             print "\n" 
          end
@@ -73,25 +95,29 @@ module Uv
             print @render_options["line-numbers"]["end"] 
             print " "
          end
+         open_line
       end
       
-      def end_parsing
+      def end_parsing name
          if @line
             print escape(@line[@position..-1].gsub(/\n|\r/, '')) 
+            while @stack.size > 1
+               opt = options @stack
+               print opt["end"] if opt
+               @stack.pop
+            end
             print @render_options["line"]["end"]
             print "\n"
          end
-         while ! @stack.empty?
-            opt = options
-            print opt["end"] if opt
-            @stack.pop
-         end
+#         opt = options @stack
+#         print opt["end"] if opt
+         @stack.pop
          print @render_options["listing"]["end"]
          print @render_options["document"]["end"] if @headers
       end
       
-      def options
-         ref = @stack.join ' '
+      def options stack
+         ref = stack.join ' '
          return @options[ref] if @options.has_key? ref
          
          result = @render_options['tags'].max do |a, b| 

data/lib/uv/utility.rb

@@ -0,0 +1,67 @@
+module Uv
+   def Uv.foreground bg
+      fg = "#FFFFFF"
+      3.times do |i|
+         fg = "#000000" if bg[i*2+1, 2].hex > 0xFF / 2 
+      end
+      fg
+   end
+   
+   def Uv.alpha_blend bg, fg
+      unless bg =~ /^#((\d|[ABCDEF]){3}|(\d|[ABCDEF]){6}|(\d|[ABCDEF]){8})$/i
+         raise(ArgumentError, "Malformed background color '#{bg}'" )
+      end
+      unless fg =~ /^#((\d|[ABCDEF]){3}|(\d|[ABCDEF]){6}|(\d|[ABCDEF]){8})$/i
+         raise(ArgumentError, "Malformed foreground color '#{fg}'" )
+      end
+      
+      if bg.size == 4
+         tbg =  (fg[1,1].hex * 0xff / 0xf).to_s(16).upcase.rjust(2, '0')
+         tbg += (fg[2,1].hex * 0xff / 0xf).to_s(16).upcase.rjust(2, '0')
+         tbg += (fg[3,1].hex * 0xff / 0xf).to_s(16).upcase.rjust(2, '0')
+         bg = "##{tbg}"
+      end
+      
+      result = ""
+      if fg.size == 4
+         result += (fg[1,1].hex * 0xff / 0xf).to_s(16).upcase.rjust(2, '0')
+         result += (fg[2,1].hex * 0xff / 0xf).to_s(16).upcase.rjust(2, '0')
+         result += (fg[3,1].hex * 0xff / 0xf).to_s(16).upcase.rjust(2, '0')
+      elsif fg.size == 9
+         if bg.size == 7
+            div0 = bg[1..-1].hex
+            div1, alpha = fg[1..-1].hex.divmod( 0x100 )
+            3.times {      
+               div0, mod0 = div0.divmod( 0x100 )
+               div1, mod1 = div1.divmod( 0x100 )
+               result = ((mod0 * alpha + mod1 * ( 0x100 - alpha ) ) / 0x100).to_s(16).upcase.rjust(2, '0') + result
+            } 
+         else
+            div_a, alpha_a = bg[1..-1].hex.divmod( 0x100 )
+            div_b, alpha_b = fg[1..-1].hex.divmod( 0x100 )
+            alpha = alpha_a + alpha_b * (0x100 - alpha_a)
+            3.times {
+               div_b, c_b = div_b.divmod( 0x100 )
+               div_a, c_a = div_a.divmod( 0x100 )
+               result = ((c_a * alpha_a + ( 0x100 - alpha_a ) * alpha_b * c_b ) / alpha).to_s(16).upcase.rjust(2, '0') + result
+            } 
+         end
+         #result = "FF00FF"
+      else
+         result = fg[1..-1]
+      end
+      "##{result}"
+   end
+   
+   def Uv.normalize_color settings, color, fg = false
+      if color
+         if fg
+            alpha_blend( settings["foreground"] ? settings["foreground"] : "#000000FF", color )
+         else
+            alpha_blend( settings["background"] ? settings["background"] : "#000000FF", color )
+         end
+      else
+         color
+      end
+   end   
+end

data/render/latex/active4d.render

@@ -4,7 +4,7 @@ line:
   begin: ""
   end: "}}\\\\"
 tags: 
-- begin: \colorbox[HTML]{F4F6FF}{
+- begin: \setlength{\fboxsep}{0ex}\colorbox[HTML]{ECF1FF}{\rule[-0.5ex]{0pt}{2.0ex}
   end: "}"
   selector: text.html source.active4d
 - begin: "{\\color[HTML]{000000}"
@@ -85,19 +85,19 @@ tags:
 - begin: "{\\color[HTML]{A535AE}"
   end: "}"
   selector: support.variable
-- begin: \colorbox[HTML]{990000}{\color[HTML]{FFFFFF}
+- begin: \setlength{\fboxsep}{0ex}\colorbox[HTML]{990000}{\rule[-0.5ex]{0pt}{2.0ex}\color[HTML]{FFFFFF}
   end: "}"
   selector: invalid
-- begin: \colorbox[HTML]{656565}{\color[HTML]{FFFFFF}
+- begin: \setlength{\fboxsep}{0ex}\colorbox[HTML]{656565}{\rule[-0.5ex]{0pt}{2.0ex}\color[HTML]{FFFFFF}
   end: "}"
   selector: meta.diff
-- begin: \colorbox[HTML]{1B63FF}{\color[HTML]{FFFFFF}
+- begin: \setlength{\fboxsep}{0ex}\colorbox[HTML]{1B63FF}{\rule[-0.5ex]{0pt}{2.0ex}\color[HTML]{FFFFFF}
   end: "}"
   selector: meta.diff.range
-- begin: \colorbox[HTML]{FF7880}{\color[HTML]{000000}
+- begin: \setlength{\fboxsep}{0ex}\colorbox[HTML]{FF7880}{\rule[-0.5ex]{0pt}{2.0ex}\color[HTML]{000000}
   end: "}"
   selector: markup.deleted.diff
-- begin: \colorbox[HTML]{98FF9A}{\color[HTML]{000000}
+- begin: \setlength{\fboxsep}{0ex}\colorbox[HTML]{98FF9A}{\rule[-0.5ex]{0pt}{2.0ex}\color[HTML]{000000}
   end: "}"
   selector: markup.inserted.diff
 - begin: "{\\color[HTML]{5E5E5E}"
@@ -126,7 +126,7 @@ document:
   end: |
     \end{document}
 
-filter: "@escaped.gsub(/(_|\\{|\\}|&|\\#|\\\\)/, '\\\\\\\\\\1').gsub(/~/, '\\\\textasciitilde').gsub(/ /,'\\\\hspace{1ex}').gsub(/\\t/,'\\\\hspace{3ex}')"
+filter: "@escaped.gsub(/(\\$)/, '\\\\\\\\\\1').gsub(/\\\\(?!\\$)/, '$\\\\\\\\backslash$').gsub(/(_|\\{|\\}|&|\\#|%)/, '\\\\\\\\\\1').gsub(/~/, '\\\\textasciitilde ').gsub(/ /,'\\\\hspace{1ex}').gsub(/\\t| /,'\\\\hspace{3ex}').gsub(/\\\"/, \"''\").gsub(/(\\^)/,'\\\\\\\\\\1{}')"
 line-numbers: 
   begin: \texttt{
   end: "}&\\mbox{\\texttt{"

data/render/latex/all_hallows_eve.render

@@ -4,10 +4,10 @@ line:
   begin: ""
   end: "}}\\\\"
 tags: 
-- begin: \colorbox[HTML]{434242}{\color[HTML]{FFFFFF}
+- begin: \setlength{\fboxsep}{0ex}\colorbox[HTML]{434242}{\rule[-0.5ex]{0pt}{2.0ex}\color[HTML]{FFFFFF}
   end: "}"
   selector: text
-- begin: \colorbox[HTML]{000000}{\color[HTML]{FFFFFF}
+- begin: \setlength{\fboxsep}{0ex}\colorbox[HTML]{000000}{\rule[-0.5ex]{0pt}{2.0ex}\color[HTML]{FFFFFF}
   end: "}"
   selector: source
 - begin: "{\\color[HTML]{9933CC}"
@@ -31,7 +31,7 @@ tags:
 - begin: "{\\textit{"
   end: "}}"
   selector: variable.parameter
-- begin: \colorbox[HTML]{9B9B9B}{\color[HTML]{FFFFFF}
+- begin: \setlength{\fboxsep}{0ex}\colorbox[HTML]{9B9B9B}{\rule[-0.5ex]{0pt}{2.0ex}\color[HTML]{FFFFFF}
   end: "}"
   selector: source comment.block
 - begin: "{\\color[HTML]{66CC33}"
@@ -40,7 +40,7 @@ tags:
 - begin: "{\\color[HTML]{AAAAAA}"
   end: "}"
   selector: string constant.character.escape
-- begin: \colorbox[HTML]{CCCC33}{\color[HTML]{000000}
+- begin: \setlength{\fboxsep}{0ex}\colorbox[HTML]{CCCC33}{\rule[-0.5ex]{0pt}{2.0ex}\color[HTML]{000000}
   end: "}"
   selector: string.interpolated
 - begin: "{\\color[HTML]{CCCC33}"
@@ -70,7 +70,7 @@ tags:
 listing: 
   begin: |
     \newcolumntype{C}{>{\color[HTML]{FFFFFF}\columncolor[HTML]{000000}}l}
-    \newcolumntype{N}{>{\color[HTML]{FFFFFF}\columncolor[HTML]{644D6E}}l}
+    \newcolumntype{N}{>{\color[HTML]{FFFFFF}\columncolor[HTML]{73597E}}l}
     \begin{longtable}{NC}
 
   end: |
@@ -90,7 +90,7 @@ document:
   end: |
     \end{document}
 
-filter: "@escaped.gsub(/(_|\\{|\\}|&|\\#|\\\\)/, '\\\\\\\\\\1').gsub(/~/, '\\\\textasciitilde').gsub(/ /,'\\\\hspace{1ex}').gsub(/\\t/,'\\\\hspace{3ex}')"
+filter: "@escaped.gsub(/(\\$)/, '\\\\\\\\\\1').gsub(/\\\\(?!\\$)/, '$\\\\\\\\backslash$').gsub(/(_|\\{|\\}|&|\\#|%)/, '\\\\\\\\\\1').gsub(/~/, '\\\\textasciitilde ').gsub(/ /,'\\\\hspace{1ex}').gsub(/\\t| /,'\\\\hspace{3ex}').gsub(/\\\"/, \"''\").gsub(/(\\^)/,'\\\\\\\\\\1{}')"
 line-numbers: 
   begin: \texttt{
   end: "}&\\mbox{\\texttt{"

data/render/latex/amy.render

@@ -4,7 +4,7 @@ line:
   begin: ""
   end: "}}\\\\"
 tags: 
-- begin: \colorbox[HTML]{200020}{\color[HTML]{404080}\textit{
+- begin: \setlength{\fboxsep}{0ex}\colorbox[HTML]{200020}{\rule[-0.5ex]{0pt}{2.0ex}\color[HTML]{404080}\textit{
   end: "}}"
   selector: comment.block
 - begin: "{\\color[HTML]{999999}"
@@ -118,7 +118,7 @@ tags:
 - begin: "{"
   end: "}"
   selector: entity.other.attribute-name
-- begin: \colorbox[HTML]{200020}{
+- begin: \setlength{\fboxsep}{0ex}\colorbox[HTML]{200020}{\rule[-0.5ex]{0pt}{2.0ex}
   end: "}"
   selector: support.constant
 - begin: "{"
@@ -127,13 +127,13 @@ tags:
 - begin: "{"
   end: "}"
   selector: support.other.variable
-- begin: \colorbox[HTML]{FFFF00}{\color[HTML]{400080}\textbf{
+- begin: \setlength{\fboxsep}{0ex}\colorbox[HTML]{FFFF00}{\rule[-0.5ex]{0pt}{2.0ex}\color[HTML]{400080}\textbf{
   end: "}}"
   selector: invalid.illegal
-- begin: \colorbox[HTML]{CC66FF}{\color[HTML]{200020}
+- begin: \setlength{\fboxsep}{0ex}\colorbox[HTML]{CC66FF}{\rule[-0.5ex]{0pt}{2.0ex}\color[HTML]{200020}
   end: "}"
   selector: invalid.deprecated
-- begin: \colorbox[HTML]{2A003F}{
+- begin: \setlength{\fboxsep}{0ex}\colorbox[HTML]{350060}{\rule[-0.5ex]{0pt}{2.0ex}
   end: "}"
   selector: source.camlp4.embedded
 - begin: "{"
@@ -145,7 +145,7 @@ tags:
 listing: 
   begin: |
     \newcolumntype{C}{>{\color[HTML]{D0D0FF}\columncolor[HTML]{200020}}l}
-    \newcolumntype{N}{>{\color[HTML]{D0D0FF}\columncolor[HTML]{500010}}l}
+    \newcolumntype{N}{>{\color[HTML]{000000}\columncolor[HTML]{800000}}l}
     \begin{longtable}{NC}
 
   end: |
@@ -165,7 +165,7 @@ document:
   end: |
     \end{document}
 
-filter: "@escaped.gsub(/(_|\\{|\\}|&|\\#|\\\\)/, '\\\\\\\\\\1').gsub(/~/, '\\\\textasciitilde').gsub(/ /,'\\\\hspace{1ex}').gsub(/\\t/,'\\\\hspace{3ex}')"
+filter: "@escaped.gsub(/(\\$)/, '\\\\\\\\\\1').gsub(/\\\\(?!\\$)/, '$\\\\\\\\backslash$').gsub(/(_|\\{|\\}|&|\\#|%)/, '\\\\\\\\\\1').gsub(/~/, '\\\\textasciitilde ').gsub(/ /,'\\\\hspace{1ex}').gsub(/\\t| /,'\\\\hspace{3ex}').gsub(/\\\"/, \"''\").gsub(/(\\^)/,'\\\\\\\\\\1{}')"
 line-numbers: 
   begin: \texttt{
   end: "}&\\mbox{\\texttt{"

data/render/latex/blackboard.render

@@ -31,7 +31,7 @@ tags:
 - begin: "{\\color[HTML]{AB2A1D}\\textit{"
   end: "}}"
   selector: invalid.deprecated
-- begin: \colorbox[HTML]{9D1E15}{\color[HTML]{F8F8F8}
+- begin: \setlength{\fboxsep}{0ex}\colorbox[HTML]{9D1E15}{\rule[-0.5ex]{0pt}{2.0ex}\color[HTML]{F8F8F8}
   end: "}"
   selector: invalid.illegal
 - begin: "{\\color[HTML]{FF6400}\\textit{"
@@ -70,10 +70,10 @@ tags:
 - begin: "{\\underline{"
   end: "}}"
   selector: source.ocaml constant.numeric.floating-point
-- begin: \colorbox[HTML]{131727}{
+- begin: \setlength{\fboxsep}{0ex}\colorbox[HTML]{F7F7F8}{\rule[-0.5ex]{0pt}{2.0ex}
   end: "}"
   selector: text.tex.latex meta.function.environment
-- begin: \colorbox[HTML]{0F1427}{
+- begin: \setlength{\fboxsep}{0ex}\colorbox[HTML]{7691F3}{\rule[-0.5ex]{0pt}{2.0ex}
   end: "}"
   selector: text.tex.latex meta.function.environment meta.function.environment
 - begin: "{\\color[HTML]{FBDE2D}"
@@ -85,7 +85,7 @@ tags:
 listing: 
   begin: |
     \newcolumntype{C}{>{\color[HTML]{F8F8F8}\columncolor[HTML]{0C1021}}l}
-    \newcolumntype{N}{>{\color[HTML]{F8F8F8}\columncolor[HTML]{253B76}}l}
+    \newcolumntype{N}{>{\color[HTML]{FFFFFF}\columncolor[HTML]{253B76}}l}
     \begin{longtable}{NC}
 
   end: |
@@ -105,7 +105,7 @@ document:
   end: |
     \end{document}
 
-filter: "@escaped.gsub(/(_|\\{|\\}|&|\\#|\\\\)/, '\\\\\\\\\\1').gsub(/~/, '\\\\textasciitilde').gsub(/ /,'\\\\hspace{1ex}').gsub(/\\t/,'\\\\hspace{3ex}')"
+filter: "@escaped.gsub(/(\\$)/, '\\\\\\\\\\1').gsub(/\\\\(?!\\$)/, '$\\\\\\\\backslash$').gsub(/(_|\\{|\\}|&|\\#|%)/, '\\\\\\\\\\1').gsub(/~/, '\\\\textasciitilde ').gsub(/ /,'\\\\hspace{1ex}').gsub(/\\t| /,'\\\\hspace{3ex}').gsub(/\\\"/, \"''\").gsub(/(\\^)/,'\\\\\\\\\\1{}')"
 line-numbers: 
   begin: \texttt{
   end: "}&\\mbox{\\texttt{"