From 27084f115e4cddb3cccc30055641842f8043f9f1 Mon Sep 17 00:00:00 2001 From: Kornelius Kalnbach Date: Thu, 15 Dec 2011 17:37:55 +0100 Subject: use bright blue because dark blue is hard to see on black terminal --- lib/coderay/encoders/terminal.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/coderay/encoders') diff --git a/lib/coderay/encoders/terminal.rb b/lib/coderay/encoders/terminal.rb index 15c8a52..005032d 100644 --- a/lib/coderay/encoders/terminal.rb +++ b/lib/coderay/encoders/terminal.rb @@ -24,14 +24,14 @@ module CodeRay :attribute_value => '31', :binary => '1;35', :char => { - :self => '36', :delimiter => '34' + :self => '36', :delimiter => '1;34' }, :class => '1;35', :class_variable => '36', :color => '32', :comment => '37', - :complex => '34', - :constant => ['34', '4'], + :complex => '1;34', + :constant => ['1;34', '4'], :decoration => '35', :definition => '1;32', :directive => ['32', '4'], @@ -56,7 +56,7 @@ module CodeRay :predefined_type => '1;30', :predefined => ['4', '1;34'], :preprocessor => '36', - :pseudo_class => '34', + :pseudo_class => '1;34', :regexp => { :self => '31', :content => '31', @@ -77,10 +77,10 @@ module CodeRay :delimiter => '1;32', }, :symbol => '1;32', - :tag => '34', + :tag => '1;34', :type => '1;34', :value => '36', - :variable => '34', + :variable => '1;34', :insert => '42', :delete => '41', -- cgit v1.2.1 From ac2d6f1898a5aa1aad7cc254290ec9341d2cdf60 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Fri, 23 Dec 2011 08:33:21 -0800 Subject: Remove assumption about a stable $: In some environments (e.g. [1]) $: can change between loading the library and using it. To avoid this problem, we always pass an absolute path to autoload internal modules. [1] https://github.com/pry/pry/issues/280 --- lib/coderay/encoders/html.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/coderay/encoders') diff --git a/lib/coderay/encoders/html.rb b/lib/coderay/encoders/html.rb index 60dfad1..c5d680c 100644 --- a/lib/coderay/encoders/html.rb +++ b/lib/coderay/encoders/html.rb @@ -109,9 +109,9 @@ module Encoders :hint => false, } - autoload :Output, 'coderay/encoders/html/output' - autoload :CSS, 'coderay/encoders/html/css' - autoload :Numbering, 'coderay/encoders/html/numbering' + autoload :Output, CodeRay.abs_path('coderay/encoders/html/output') + autoload :CSS, CodeRay.abs_path('coderay/encoders/html/css') + autoload :Numbering, CodeRay.abs_path('coderay/encoders/html/numbering') attr_reader :css -- cgit v1.2.1 From 5c4c0065784c6420224516e13a0c50d86e792363 Mon Sep 17 00:00:00 2001 From: Kornelius Kalnbach Date: Tue, 27 Dec 2011 02:39:02 +0100 Subject: Bug #6: merge ConradIrwin's approach with korny's --- lib/coderay/encoders/html.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/coderay/encoders') diff --git a/lib/coderay/encoders/html.rb b/lib/coderay/encoders/html.rb index c5d680c..c32dbd1 100644 --- a/lib/coderay/encoders/html.rb +++ b/lib/coderay/encoders/html.rb @@ -109,9 +109,9 @@ module Encoders :hint => false, } - autoload :Output, CodeRay.abs_path('coderay/encoders/html/output') - autoload :CSS, CodeRay.abs_path('coderay/encoders/html/css') - autoload :Numbering, CodeRay.abs_path('coderay/encoders/html/numbering') + autoload :Output, CodeRay.coderay_path('encoders', 'html', 'output') + autoload :CSS, CodeRay.coderay_path('encoders', 'html', 'css') + autoload :Numbering, CodeRay.coderay_path('encoders', 'html', 'numbering') attr_reader :css -- cgit v1.2.1