coderay 0.7.2.168 → 0.7.2.176

data/lib/coderay/styles/murphy.rb

@@ -1,119 +1,119 @@
-module CodeRay
-module Styles
-
-  class Murphy < Style
-
-    register_for :murphy
-
-    code_background = '#001129'
-    numbers_background = code_background
-    border_color = 'silver'
-    normal_color = '#C0C0C0'
-
-    CSS_MAIN_STYLES = <<-MAIN
-.CodeRay {
-  background-color: #{code_background};
-  border: 1px solid #{border_color};
-  font-family: 'Courier New', 'Terminal', monospace;
-  color: #{normal_color};
-}
-.CodeRay pre { margin: 0px; }
-
-div.CodeRay { }
-
-span.CodeRay { white-space: pre; border: 0px; padding: 2px; }
-
-table.CodeRay { border-collapse: collapse; width: 100%; padding: 2px; }
-table.CodeRay td { padding: 2px 4px; vertical-align: top; }
-
-.CodeRay .line_numbers, .CodeRay .no {
-  background-color: #{numbers_background};
-  color: gray;
-  text-align: right;
-}
-.CodeRay .line_numbers tt { font-weight: bold; }
-.CodeRay .no { padding: 0px 4px; }
-.CodeRay .code { width: 100%; }
-
-ol.CodeRay { font-size: 10pt; }
-ol.CodeRay li { white-space: pre; }
-
-.CodeRay .code pre { overflow: auto; }
-    MAIN
-
-    TOKEN_COLORS = <<-'TOKENS'
-.af { color:#00C; }
-.an { color:#007; }
-.av { color:#700; }
-.aw { color:#C00; }
-.bi { color:#509; font-weight:bold; }
-.c  { color:#666; }
-
-.ch { color:#88F; }
-.ch .k { color:#04D; }
-.ch .dl { color:#039; }
-
-.cl { color:#e9e; font-weight:bold; }
-.co { color:#5ED; font-weight:bold; }
-.cr { color:#0A0; }
-.cv { color:#ccf; }
-.df { color:#099; font-weight:bold; }
-.di { color:#088; font-weight:bold; }
-.dl { color:black; }
-.do { color:#970; }
-.ds { color:#D42; font-weight:bold; }
-.e  { color:#666; font-weight:bold; }
-.er { color:#F00; background-color:#FAA; }
-.ex { color:#F00; font-weight:bold; }
-.fl { color:#60E; font-weight:bold; }
-.fu { color:#5ed; font-weight:bold; }
-.gv { color:#f84; }
-.hx { color:#058; font-weight:bold; }
-.i  { color:#66f; font-weight:bold; }
-.ic { color:#B44; font-weight:bold; }
-.il { }
-.in { color:#B2B; font-weight:bold; }
-.iv { color:#aaf; }
-.la { color:#970; font-weight:bold; }
-.lv { color:#963; }
-.oc { color:#40E; font-weight:bold; }
-.on { color:#000; font-weight:bold; }
-.op { }
-.pc { color:#08f; font-weight:bold; }
-.pd { color:#369; font-weight:bold; }
-.pp { color:#579; }
-.pt { color:#66f; font-weight:bold; }
-.r  { color:#5de; font-weight:bold; }
-
-.rx { background-color:#221133; }
-.rx .k { color:#f8f; }
-.rx .dl { color:#f0f; }
-.rx .mod { color:#f0b; }
-.rx .fu  { color:#404; font-weight: bold; }
-
-.s  { background-color:#331122; }
-.s  .s { background-color:#ffe0e0; }
-.s  .s  .s { background-color:#ffd0d0; }
-.s  .k { color:#F88; }
-.s  .dl { color:#f55; }
-
-.sh { background-color:#f0fff0; }
-.sh .k { color:#2B2; }
-.sh .dl { color:#161; }
-
-.sy { color:#Fc8; }
-.sy .k { color:#Fc8; }
-.sy .dl { color:#F84; }
-
-.ta { color:#070; }
-.tf { color:#070; font-weight:bold; }
-.ts { color:#D70; font-weight:bold; }
-.ty { color:#339; font-weight:bold; }
-.v  { color:#036; }
-.xt { color:#444; }
-    TOKENS
-
-  end
-
-end
-end
+module CodeRay
+module Styles
+
+  class Murphy < Style
+
+    register_for :murphy
+
+    code_background = '#001129'
+    numbers_background = code_background
+    border_color = 'silver'
+    normal_color = '#C0C0C0'
+
+    CSS_MAIN_STYLES = <<-MAIN
+.CodeRay {
+  background-color: #{code_background};
+  border: 1px solid #{border_color};
+  font-family: 'Courier New', 'Terminal', monospace;
+  color: #{normal_color};
+}
+.CodeRay pre { margin: 0px; }
+
+div.CodeRay { }
+
+span.CodeRay { white-space: pre; border: 0px; padding: 2px; }
+
+table.CodeRay { border-collapse: collapse; width: 100%; padding: 2px; }
+table.CodeRay td { padding: 2px 4px; vertical-align: top; }
+
+.CodeRay .line_numbers, .CodeRay .no {
+  background-color: #{numbers_background};
+  color: gray;
+  text-align: right;
+}
+.CodeRay .line_numbers tt { font-weight: bold; }
+.CodeRay .no { padding: 0px 4px; }
+.CodeRay .code { width: 100%; }
+
+ol.CodeRay { font-size: 10pt; }
+ol.CodeRay li { white-space: pre; }
+
+.CodeRay .code pre { overflow: auto; }
+    MAIN
+
+    TOKEN_COLORS = <<-'TOKENS'
+.af { color:#00C; }
+.an { color:#007; }
+.av { color:#700; }
+.aw { color:#C00; }
+.bi { color:#509; font-weight:bold; }
+.c  { color:#666; }
+
+.ch { color:#88F; }
+.ch .k { color:#04D; }
+.ch .dl { color:#039; }
+
+.cl { color:#e9e; font-weight:bold; }
+.co { color:#5ED; font-weight:bold; }
+.cr { color:#0A0; }
+.cv { color:#ccf; }
+.df { color:#099; font-weight:bold; }
+.di { color:#088; font-weight:bold; }
+.dl { color:black; }
+.do { color:#970; }
+.ds { color:#D42; font-weight:bold; }
+.e  { color:#666; font-weight:bold; }
+.er { color:#F00; background-color:#FAA; }
+.ex { color:#F00; font-weight:bold; }
+.fl { color:#60E; font-weight:bold; }
+.fu { color:#5ed; font-weight:bold; }
+.gv { color:#f84; }
+.hx { color:#058; font-weight:bold; }
+.i  { color:#66f; font-weight:bold; }
+.ic { color:#B44; font-weight:bold; }
+.il { }
+.in { color:#B2B; font-weight:bold; }
+.iv { color:#aaf; }
+.la { color:#970; font-weight:bold; }
+.lv { color:#963; }
+.oc { color:#40E; font-weight:bold; }
+.on { color:#000; font-weight:bold; }
+.op { }
+.pc { color:#08f; font-weight:bold; }
+.pd { color:#369; font-weight:bold; }
+.pp { color:#579; }
+.pt { color:#66f; font-weight:bold; }
+.r  { color:#5de; font-weight:bold; }
+
+.rx { background-color:#221133; }
+.rx .k { color:#f8f; }
+.rx .dl { color:#f0f; }
+.rx .mod { color:#f0b; }
+.rx .fu  { color:#404; font-weight: bold; }
+
+.s  { background-color:#331122; }
+.s  .s { background-color:#ffe0e0; }
+.s  .s  .s { background-color:#ffd0d0; }
+.s  .k { color:#F88; }
+.s  .dl { color:#f55; }
+
+.sh { background-color:#f0fff0; }
+.sh .k { color:#2B2; }
+.sh .dl { color:#161; }
+
+.sy { color:#Fc8; }
+.sy .k { color:#Fc8; }
+.sy .dl { color:#F84; }
+
+.ta { color:#070; }
+.tf { color:#070; font-weight:bold; }
+.ts { color:#D70; font-weight:bold; }
+.ty { color:#339; font-weight:bold; }
+.v  { color:#036; }
+.xt { color:#444; }
+    TOKENS
+
+  end
+
+end
+end

data/lib/coderay/tokens.rb

@@ -170,7 +170,7 @@ module CodeRay
       print ' Tokens#optimize: before: %d - ' % size if $DEBUG
       last_kind = last_text = nil
       new = self.class.new
-      each do |text, kind|
+      for text, kind in self
         if text.is_a? String
           if kind == last_kind
             last_text << text
@@ -195,6 +195,51 @@ module CodeRay
     def optimize!
       replace optimize
     end
+    
+    # Ensure that all :open tokens have a correspondent :close one.
+    #
+    # TODO: Test this!
+    def fix
+      # Check token nesting using a stack of kinds.
+      opened = []
+      for token, kind in self
+        if token == :open
+          opened.push kind
+        elsif token == :close
+          expected = opened.pop
+          if kind != expected
+            # Unexpected :close; decide what to do based on the kind:
+            # - token was opened earlier: also close tokens in between
+            # - token was never opened: delete the :close (skip with next)
+            next unless opened.rindex expected
+            tokens << [:close, kind] until (kind = opened.pop) == expected
+          end
+        end
+        tokens << [token, kind]
+      end
+      # Close remaining opened tokens
+      tokens << [:close, kind] while kind = opened.pop
+      tokens
+    end
+    
+    def fix!
+      replace fix
+    end
+    
+    # Makes sure that:
+    # - newlines are single tokens
+    #   (which means all other token are single-line)
+    # - there are no open tokens at the end the line
+    #
+    # This makes it simple for encoders that work line-oriented,
+    # like HTML with list-style numeration.
+    def split_into_lines
+      raise NotImplementedError
+    end
+
+    def split_into_lines!
+      replace split_into_lines
+    end
 
     # Dumps the object into a String that can be saved
     # in files or databases.
@@ -304,7 +349,8 @@ module CodeRay
 
     # This method is not implemented due to speed reasons. Use Tokens.
     def text_size
-      raise NotImplementedError, 'This method is not implemented due to speed reasons.'
+      raise NotImplementedError,
+        'This method is not implemented due to speed reasons.'
     end
 
     # A TokenStream cannot be dumped. Use Tokens.

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: coderay
 version: !ruby/object:Gem::Version 
-  version: 0.7.2.168
-date: 2006-07-11 00:00:00 +02:00
+  version: 0.7.2.176
+date: 2006-10-15 00:00:00 +02:00
 summary: CodeRay is a fast syntax highlighter engine for many languages.
 require_paths: 
   - lib
@@ -34,67 +34,67 @@ authors:
   - murphy
 files: 
   - "./lib/coderay.rb"
-  - "./lib/coderay/style.rb"
+  - "./lib/coderay/tokens.rb"
   - "./lib/coderay/encoder.rb"
-  - "./lib/coderay/scanner.rb"
+  - "./lib/coderay/style.rb"
   - "./lib/coderay/duo.rb"
-  - "./lib/coderay/tokens.rb"
-  - "./lib/coderay/encoders/html.rb"
-  - "./lib/coderay/encoders/debug.rb"
-  - "./lib/coderay/encoders/xml.rb"
-  - "./lib/coderay/encoders/_map.rb"
-  - "./lib/coderay/encoders/div.rb"
+  - "./lib/coderay/scanner.rb"
   - "./lib/coderay/encoders/tokens.rb"
-  - "./lib/coderay/encoders/count.rb"
+  - "./lib/coderay/encoders/debug.rb"
+  - "./lib/coderay/encoders/text.rb"
+  - "./lib/coderay/encoders/page.rb"
   - "./lib/coderay/encoders/null.rb"
-  - "./lib/coderay/encoders/statistic.rb"
   - "./lib/coderay/encoders/yaml.rb"
   - "./lib/coderay/encoders/span.rb"
-  - "./lib/coderay/encoders/text.rb"
-  - "./lib/coderay/encoders/page.rb"
+  - "./lib/coderay/encoders/count.rb"
+  - "./lib/coderay/encoders/statistic.rb"
+  - "./lib/coderay/encoders/xml.rb"
+  - "./lib/coderay/encoders/html.rb"
+  - "./lib/coderay/encoders/div.rb"
+  - "./lib/coderay/encoders/_map.rb"
   - "./lib/coderay/encoders/html/classes.rb"
-  - "./lib/coderay/encoders/html/output.rb"
-  - "./lib/coderay/encoders/html/numerization.rb"
   - "./lib/coderay/encoders/html/css.rb"
-  - "./lib/coderay/helpers/plugin.rb"
-  - "./lib/coderay/helpers/filetype.rb"
+  - "./lib/coderay/encoders/html/numerization.rb"
+  - "./lib/coderay/encoders/html/output.rb"
   - "./lib/coderay/helpers/gzip_simple.rb"
+  - "./lib/coderay/helpers/filetype.rb"
   - "./lib/coderay/helpers/word_list.rb"
-  - "./lib/coderay/scanners/rhtml.rb"
-  - "./lib/coderay/scanners/delphi.rb"
+  - "./lib/coderay/helpers/plugin.rb"
   - "./lib/coderay/scanners/c.rb"
+  - "./lib/coderay/scanners/rhtml.rb"
+  - "./lib/coderay/scanners/html.rb"
   - "./lib/coderay/scanners/plaintext.rb"
   - "./lib/coderay/scanners/_map.rb"
-  - "./lib/coderay/scanners/html.rb"
-  - "./lib/coderay/scanners/ruby.rb"
+  - "./lib/coderay/scanners/delphi.rb"
   - "./lib/coderay/scanners/xml.rb"
+  - "./lib/coderay/scanners/ruby.rb"
   - "./lib/coderay/scanners/nitro_xhtml.rb"
   - "./lib/coderay/scanners/ruby/patterns.rb"
   - "./lib/coderay/styles/cycnus.rb"
   - "./lib/coderay/styles/murphy.rb"
   - "./lib/coderay/styles/_map.rb"
+  - "./demo/demo_tokens.rb"
   - "./demo/suite.rb"
-  - "./demo/demo_server.rb"
-  - "./demo/demo_load_encoder.rb"
-  - "./demo/demo_load_scanner.rb"
-  - "./demo/demo_more.rb"
   - "./demo/demo_css.rb"
+  - "./demo/demo_div.rb"
+  - "./demo/demo_highlight.rb"
+  - "./demo/demo_simple.rb"
+  - "./demo/demo_encoder.rb"
+  - "./demo/demo_html2.rb"
+  - "./demo/demo_load_scanner.rb"
+  - "./demo/demo_html.rb"
+  - "./demo/demo_dump.rb"
   - "./demo/demo_cache.rb"
+  - "./demo/demo_more.rb"
   - "./demo/demo_html_list.rb"
+  - "./demo/demo_global_vars.rb"
   - "./demo/demo_global_vars2.rb"
   - "./demo/demo_stream2.rb"
-  - "./demo/demo_encoder.rb"
-  - "./demo/demo_div.rb"
-  - "./demo/demo_html2.rb"
-  - "./demo/demo_count.rb"
-  - "./demo/demo_simple.rb"
-  - "./demo/demo_scanner.rb"
+  - "./demo/demo_load_encoder.rb"
   - "./demo/demo_stream.rb"
-  - "./demo/demo_global_vars.rb"
-  - "./demo/demo_tokens.rb"
-  - "./demo/demo_html.rb"
-  - "./demo/demo_dump.rb"
-  - "./demo/demo_highlight.rb"
+  - "./demo/demo_scanner.rb"
+  - "./demo/demo_count.rb"
+  - "./demo/demo_server.rb"
   - "./README"
   - "./LICENSE"
   - "./FOLDERS"