summaryrefslogtreecommitdiffstats
path: root/lib/redmine/syntax_highlighting.rb
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-09-20 02:44:16 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-09-20 02:44:16 +0000
commit125ffb33d31b253768860fe20cdef49d745f302e (patch)
tree96143b65e0871db34ab4ed4c13166ade0d998d25 /lib/redmine/syntax_highlighting.rb
parent3d1d57d04c7e55810e35813675b824042bebc4e6 (diff)
downloadredmine-125ffb33d31b253768860fe20cdef49d745f302e.tar.gz
redmine-125ffb33d31b253768860fe20cdef49d745f302e.zip
remove trailing white-spaces from lib/redmine/syntax_highlighting.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7409 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/syntax_highlighting.rb')
-rw-r--r--lib/redmine/syntax_highlighting.rb18
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/redmine/syntax_highlighting.rb b/lib/redmine/syntax_highlighting.rb
index 4455b90c7..14d08de15 100644
--- a/lib/redmine/syntax_highlighting.rb
+++ b/lib/redmine/syntax_highlighting.rb
@@ -1,27 +1,27 @@
# Redmine - project management software
-# Copyright (C) 2006-2010 Jean-Philippe Lang
+# Copyright (C) 2006-2011 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
module Redmine
module SyntaxHighlighting
-
+
class << self
attr_reader :highlighter
delegate :highlight_by_filename, :highlight_by_language, :to => :highlighter
-
+
def highlighter=(name)
if name.is_a?(Module)
@highlighter = name
@@ -30,11 +30,11 @@ module Redmine
end
end
end
-
+
module CodeRay
require 'coderay'
require 'coderay/helpers/file_type'
-
+
class << self
# Highlights +text+ as the content of +filename+
# Should not return line numbers nor outer pre tag
@@ -42,7 +42,7 @@ module Redmine
language = ::CodeRay::FileType[filename]
language ? ::CodeRay.scan(text, language).html : ERB::Util.h(text)
end
-
+
# Highlights +text+ using +language+ syntax
# Should not return outer pre tag
def highlight_by_language(text, language)
@@ -51,6 +51,6 @@ module Redmine
end
end
end
-
+
SyntaxHighlighting.highlighter = 'CodeRay'
end