* Small corrections in html_processor (should change name)

* Many modifications to latex rendering


git-svn-id: http://ultraviolet.rubyforge.org/svn@9 8dcbe89a-5409-4d9f-a3d6-4ba0a7c8629b

bin/theme2latexrender

@@ -103,7 +103,7 @@ render["tags"] = []
    end
 end
 
-render["filter"] = '@escaped.gsub(/(_|\{|\}|~|&|\#|\\\\)/, \'\\\\\\\\\1\').gsub(/ /,\'\\\\hspace{1ex}\').gsub(/\t/,\'\\\\hspace{3ex}\')'
+render["filter"] = '@escaped.gsub(/(_|\{|\}|&|\#|\\\\)/, \'\\\\\\\\\1\').gsub(/~/, \'\\\\textasciitilde\').gsub(/ /,\'\\\\hspace{1ex}\').gsub(/\t/,\'\\\\hspace{3ex}\')'
 
 tag = {}
 tag["begin"] = ""
@@ -124,11 +124,13 @@ render["listing"] = tag
 
 tag = {}
 tag["begin"] = <<END
-\\documentclass[a4paper]{article}
+\\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
 

bin/theme2xhtmlrender

@@ -86,7 +86,13 @@ render["tags"] = []
    end
 end
 
-render["filter"] = "@string.gsub(/_/, '\\_')"
+render["filter"] = "CGI.escapeHTML( @escaped )"
+
+tag = {}
+tag["begin"] = ""
+tag["end"]   = ""
+render["line"] = tag
+
 
 tag = {}
 tag["begin"] = "<pre class=\"#{standard_name}\">"

bin/uv

@@ -116,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

lib/uv.rb

@@ -23,7 +23,7 @@ def Uv.init_syntaxes
          @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')
@@ -63,7 +63,7 @@ def Uv.syntax_for_file file_name
       result
    end
 
-   def Uv.parse text, output = "xhtml", syntax_name = nil, line_numbers = false, render_style = "classic", headers = true
+   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)

lib/uv/html_processor.rb

@@ -43,24 +43,26 @@ def escape string
 
       def open_tag name, position
          @stack << name
-         print escape(@line[@position...position]) if position > @position
+         print escape(@line[@position...position].gsub(/\n|\r/, '')) if position > @position
          @position = position
          opt = options
          print opt["begin"] if opt
       end
 
       def close_tag name, position
-         print escape(@line[@position...position]) if position > @position
+         print escape(@line[@position...position].gsub(/\n|\r/, '')) if position > @position
          @position = position
          opt = options
          print opt["end"] if opt
          @stack.pop
       end
 
       def new_line line
-         print escape(@line[@position..-1]).gsub(/\n|\r/, '') if @line 
-         print @render_options["line"]["end"] if @line_number > 0
-         print "\n" if @line
+         if @line
+            print escape(@line[@position..-1].gsub(/\n|\r/, ''))
+            print @render_options["line"]["end"]
+            print "\n" 
+         end
          @position = 0
          @line_number += 1
          @line = line
@@ -74,9 +76,11 @@ def new_line line
       end
 
       def end_parsing
-         print escape(@line[@position..-1].gsub(/\n|\r/, '')) if @line 
-         print @render_options["line"]["end"] if @line_number > 0
-         print "\n" if @line
+         if @line
+            print escape(@line[@position..-1].gsub(/\n|\r/, '')) 
+            print @render_options["line"]["end"]
+            print "\n"
+         end
          while ! @stack.empty?
             opt = options
             print opt["end"] if opt

render/latex/active4d.render

@@ -114,17 +114,19 @@ listing:
 
 document: 
   begin: |
-    \documentclass[a4paper]{article}
+    \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: |
     \end{document}
 
-filter: "@escaped.gsub(/(_|\\{|\\}|~|&|\\#|\\\\)/, '\\\\\\\\\\1').gsub(/ /,'\\\\hspace{1ex}').gsub(/\\t/,'\\\\hspace{3ex}')"
+filter: "@escaped.gsub(/(_|\\{|\\}|&|\\#|\\\\)/, '\\\\\\\\\\1').gsub(/~/, '\\\\textasciitilde').gsub(/ /,'\\\\hspace{1ex}').gsub(/\\t/,'\\\\hspace{3ex}')"
 line-numbers: 
   begin: \texttt{
   end: "}&\\mbox{\\texttt{"

render/latex/all_hallows_eve.render

@@ -78,17 +78,19 @@ listing:
 
 document: 
   begin: |
-    \documentclass[a4paper]{article}
+    \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: |
     \end{document}
 
-filter: "@escaped.gsub(/(_|\\{|\\}|~|&|\\#|\\\\)/, '\\\\\\\\\\1').gsub(/ /,'\\\\hspace{1ex}').gsub(/\\t/,'\\\\hspace{3ex}')"
+filter: "@escaped.gsub(/(_|\\{|\\}|&|\\#|\\\\)/, '\\\\\\\\\\1').gsub(/~/, '\\\\textasciitilde').gsub(/ /,'\\\\hspace{1ex}').gsub(/\\t/,'\\\\hspace{3ex}')"
 line-numbers: 
   begin: \texttt{
   end: "}&\\mbox{\\texttt{"

render/latex/amy.render

@@ -153,17 +153,19 @@ listing:
 
 document: 
   begin: |
-    \documentclass[a4paper]{article}
+    \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: |
     \end{document}
 
-filter: "@escaped.gsub(/(_|\\{|\\}|~|&|\\#|\\\\)/, '\\\\\\\\\\1').gsub(/ /,'\\\\hspace{1ex}').gsub(/\\t/,'\\\\hspace{3ex}')"
+filter: "@escaped.gsub(/(_|\\{|\\}|&|\\#|\\\\)/, '\\\\\\\\\\1').gsub(/~/, '\\\\textasciitilde').gsub(/ /,'\\\\hspace{1ex}').gsub(/\\t/,'\\\\hspace{3ex}')"
 line-numbers: 
   begin: \texttt{
   end: "}&\\mbox{\\texttt{"

render/latex/blackboard.render

@@ -93,17 +93,19 @@ listing:
 
 document: 
   begin: |
-    \documentclass[a4paper]{article}
+    \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: |
     \end{document}
 
-filter: "@escaped.gsub(/(_|\\{|\\}|~|&|\\#|\\\\)/, '\\\\\\\\\\1').gsub(/ /,'\\\\hspace{1ex}').gsub(/\\t/,'\\\\hspace{3ex}')"
+filter: "@escaped.gsub(/(_|\\{|\\}|&|\\#|\\\\)/, '\\\\\\\\\\1').gsub(/~/, '\\\\textasciitilde').gsub(/ /,'\\\\hspace{1ex}').gsub(/\\t/,'\\\\hspace{3ex}')"
 line-numbers: 
   begin: \texttt{
   end: "}&\\mbox{\\texttt{"

render/latex/brilliance_black.render

@@ -584,17 +584,19 @@ listing:
 
 document: 
   begin: |
-    \documentclass[a4paper]{article}
+    \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: |
     \end{document}
 
-filter: "@escaped.gsub(/(_|\\{|\\}|~|&|\\#|\\\\)/, '\\\\\\\\\\1').gsub(/ /,'\\\\hspace{1ex}').gsub(/\\t/,'\\\\hspace{3ex}')"
+filter: "@escaped.gsub(/(_|\\{|\\}|&|\\#|\\\\)/, '\\\\\\\\\\1').gsub(/~/, '\\\\textasciitilde').gsub(/ /,'\\\\hspace{1ex}').gsub(/\\t/,'\\\\hspace{3ex}')"
 line-numbers: 
   begin: \texttt{
   end: "}&\\mbox{\\texttt{"

render/latex/brilliance_dull.render

@@ -543,17 +543,19 @@ listing:
 
 document: 
   begin: |
-    \documentclass[a4paper]{article}
+    \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: |
     \end{document}
 
-filter: "@escaped.gsub(/(_|\\{|\\}|~|&|\\#|\\\\)/, '\\\\\\\\\\1').gsub(/ /,'\\\\hspace{1ex}').gsub(/\\t/,'\\\\hspace{3ex}')"
+filter: "@escaped.gsub(/(_|\\{|\\}|&|\\#|\\\\)/, '\\\\\\\\\\1').gsub(/~/, '\\\\textasciitilde').gsub(/ /,'\\\\hspace{1ex}').gsub(/\\t/,'\\\\hspace{3ex}')"
 line-numbers: 
   begin: \texttt{
   end: "}&\\mbox{\\texttt{"

render/latex/cobalt.render

@@ -144,17 +144,19 @@ listing:
 
 document: 
   begin: |
-    \documentclass[a4paper]{article}
+    \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: |
     \end{document}
 
-filter: "@escaped.gsub(/(_|\\{|\\}|~|&|\\#|\\\\)/, '\\\\\\\\\\1').gsub(/ /,'\\\\hspace{1ex}').gsub(/\\t/,'\\\\hspace{3ex}')"
+filter: "@escaped.gsub(/(_|\\{|\\}|&|\\#|\\\\)/, '\\\\\\\\\\1').gsub(/~/, '\\\\textasciitilde').gsub(/ /,'\\\\hspace{1ex}').gsub(/\\t/,'\\\\hspace{3ex}')"
 line-numbers: 
   begin: \texttt{
   end: "}&\\mbox{\\texttt{"