jro_apps/redmine Commit - r699:42db3cac06ad

Added code highlighting support in wiki, using this syntax:...

Jean-Philippe Lang -

r699:42db3cac06ad

parent child

Context file:

r699:42db3cac06ad

Collapse all files

app/views/wiki/edit.rhtml +4 0

             <div class="contextual">
             <%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>
             </div>
             <h2><%= @page.pretty_title %></h2>
             <% form_for :content, @content, :url => {:action => 'edit', :page => @page.title}, :html => {:id => 'wiki_form'} do |f| %>
             <%= f.hidden_field :version %>
             <%= error_messages_for 'content' %>
             <div class="contextual">
             <%= l(:setting_text_formatting) %>:
             <%= link_to l(:label_help), {:controller => 'help', :ctrl => 'wiki', :page => 'syntax' },
                                         :onclick => "window.open('#{ url_for :controller => 'help', :ctrl => 'wiki', :page => 'syntax' }', '', 'resizable=yes, location=no, width=300, height=500, menubar=no, status=no, scrollbars=yes'); return false;" %>
             </div>
             <p><%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit' %></p>
             <p><label><%= l(:field_comments) %></label><br /><%= f.text_field :comments, :size => 120 %></p>
             <p><%= submit_tag l(:button_save) %>
                <%= link_to_remote l(:label_preview),
                                    { :url => { :controller => 'wiki', :action => 'preview', :id => @project, :page => @page.title },
                                      :method => 'post',
                                      :update => 'preview',
                                      :with => "Form.serialize('wiki_form')"
                                    } %></p>
             <%= wikitoolbar_for 'content_text' %>
             <% end %>
             <div id="preview" class="wiki"></div>
+            <% content_for :header_tags do %>
+              <%= stylesheet_link_tag 'scm' %>
+            <% end %>

app/views/wiki/show.rhtml +4 0

             <div class="contextual">
             <%= link_to_if_authorized(l(:button_edit), {:action => 'edit', :page => @page.title}, :class => 'icon icon-edit') if @content.version == @page.content.version %>
             <%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :page => @page.title}, :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') %>
             <%= link_to_if_authorized(l(:button_rollback), {:action => 'edit', :page => @page.title, :version => @content.version }, :class => 'icon icon-cancel') if @content.version < @page.content.version %>
             <%= link_to(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %>
             <%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>
             </div>
             <% if @content.version != @page.content.version %>
                 <p>
                 <%= link_to(('&#171; ' + l(:label_previous)), :action => 'index', :page => @page.title, :version => (@content.version - 1)) + " - " if @content.version > 1 %>
                 <%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}" %>
                 <%= '(' + link_to('diff', :controller => 'wiki', :action => 'diff', :page => @page.title, :version => @content.version) + ')' if @content.version > 1 %> -
                 <%= link_to((l(:label_next) + ' &#187;'), :action => 'index', :page => @page.title, :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %>
                 <%= link_to(l(:label_current_version), :action => 'index', :page => @page.title) %>
                 <br />
                 <em><%= @content.author ? @content.author.name : "anonyme" %>, <%= format_time(@content.updated_on) %> </em><br />
                 <%=h @content.comments %>
                 </p>
                 <hr />
             <% end %>
             <%= render(:partial => "wiki/content", :locals => {:content => @content}) %>
             <%= link_to_attachments @page.attachments, :delete_url => (authorize_for('wiki', 'destroy_attachment') ? {:controller => 'wiki', :action => 'destroy_attachment', :page => @page.title} : nil) %>
             <div class="contextual">
             <%= l(:label_export_to) %>
             <%= link_to 'HTML', {:export => 'html', :version => @content.version}, :class => 'icon icon-html' %>,
             <%= link_to 'TXT', {:export => 'txt', :version => @content.version}, :class => 'icon icon-txt' %>
             </div>
             <% if authorize_for('wiki', 'add_attachment') %>
             <p><%= toggle_link l(:label_attachment_new), "add_attachment_form" %></p>
             <% form_tag({ :controller => 'wiki', :action => 'add_attachment', :page => @page.title }, :multipart => true, :class => "tabular", :id => "add_attachment_form", :style => "display:none;") do %>
               <%= render :partial => 'attachments/form' %>
             <%= submit_tag l(:button_add) %>
             <% end %>
             <% end %>
+            <% content_for :header_tags do %>
+              <%= stylesheet_link_tag 'scm' %>
+            <% end %>

lib/redmine/wiki_formatting.rb +17 -1

             require 'redcloth'
+            require 'coderay'
             module Redmine
               module WikiFormatting
               private
                 class TextileFormatter < RedCloth
                   RULES = [:inline_auto_link, :inline_auto_mailto, :textile ]
                   def initialize(*args)
                     super
                     self.hard_breaks=true
                   end
                   def to_html
                     super(*RULES).to_s
                   end
                 private
                   # Patch for RedCloth.  Fixed in RedCloth r128 but _why hasn't released it yet.
                   # <a href="http://code.whytheluckystiff.net/redcloth/changeset/128">http://code.whytheluckystiff.net/redcloth/changeset/128</a>
                   def hard_break( text )
                     text.gsub!( /(.)\n(?!\n|\Z| *([#*=]+(\s|$)|[{|]))/, "\\1<br />" ) if hard_breaks
                   end
+                  # Patch to add code highlighting support to RedCloth
+                  def smooth_offtags( text )
+                    unless @pre_list.empty?
+                      ## replace <pre> content
+                      text.gsub!(/<redpre#(\d+)>/) do
+                        content = @pre_list[$1.to_i]
+                        if content.match(/<code\s+class="(\w+)">\s?(.+)/m)
+                          content = "<code class=\"#{$1} CodeRay\">" +
+                            CodeRay.scan($2, $1).html(:escape => false, :line_numbers => :inline)
+                        end
+                        content
+                      end
+                    end
+                  end
                   AUTO_LINK_RE = %r{
                                     (                          # leading text
                                       <\w+.*?>|                # leading HTML tag, or
                                       [^=<>!:'"/]|             # leading punctuation, or
                                       ^                        # beginning of line
                                     )
                                     (
                                       (?:https?://)|           # protocol spec, or
                                       (?:www\.)                # www.*
                                     )
                                     (
                                       [-\w]+                   # subdomain or domain
                                       (?:\.[-\w]+)*            # remaining subdomains or domain
                                       (?::\d+)?                # port
                                       (?:/(?:(?:[~\w\+%-]|(?:[,.;:][^\s$]))+)?)* # path
                                       (?:\?[\w\+%&=.;-]+)?     # query string
                                       (?:\#[\w\-]*)?           # trailing anchor
                                     )
                                     ([[:punct:]]|\s|<|$)       # trailing text
                                    }x unless const_defined?(:AUTO_LINK_RE)
                   # Turns all urls into clickable links (code from Rails).
                   def inline_auto_link(text)
                     text.gsub!(AUTO_LINK_RE) do
                       all, a, b, c, d = $&, $1, $2, $3, $4
                       if a =~ /<a\s/i || a =~ /![<>=]?/
                         # don't replace URL's that are already linked
                         # and URL's prefixed with ! !> !< != (textile images)
                         all
                       else
                         text = b + c
                         %(#{a}<a href="#{b=="www."?"http://www.":b}#{c}">#{text}</a>#{d})
                       end
                     end
                   end
                   # Turns all email addresses into clickable links (code from Rails).
                   def inline_auto_mailto(text)
                     text.gsub!(/([\w\.!#\$%\-+.]+@[A-Za-z0-9\-]+(\.[A-Za-z0-9\-]+)+)/) do
                       text = $1
                       %{<a href="mailto:#{$1}" class="email">#{text}</a>}
                     end
                   end
                 end
               public
                 def self.to_html(text, options = {})
                   TextileFormatter.new(text).to_html
                 end
               end
             end

public/stylesheets/scm.css +1 -1

             div.action_M { background: #fd8 }
             div.action_D { background: #f88 }
             div.action_A { background: #bfb }
             tr.spacing {
                 border: 1px solid #d7d7d7;
             }
             .line-num {
                 border: 1px solid #d7d7d7;
             	font-size: 0.8em;
             	text-align: right;
             	width: 3em;
             	padding-right: 3px;
             }
             .line-code {
             	font-size: 1.4em;
             }
             table.list thead th.list-filename {
             	background-color: #ddc;
             	font-weight: bolder;
             	text-align: left;
             }
             /************* Coderay styles *************/
-            .CodeRay {
+            table.CodeRay {
               background-color: #fafafa;
             }
             .CodeRay pre { margin: 0px }
             span.CodeRay { white-space: pre; border: 0px; padding: 2px }
             .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 }
             .CodeRay .debug { color:white ! important; background:blue ! important; }
             .CodeRay .af { color:#00C }
             .CodeRay .an { color:#007 }
             .CodeRay .av { color:#700 }
             .CodeRay .aw { color:#C00 }
             .CodeRay .bi { color:#509; font-weight:bold }
             .CodeRay .c  { color:#666; }
             .CodeRay .ch { color:#04D }
             .CodeRay .ch .k { color:#04D }
             .CodeRay .ch .dl { color:#039 }
             .CodeRay .cl { color:#B06; font-weight:bold }
             .CodeRay .co { color:#036; font-weight:bold }
             .CodeRay .cr { color:#0A0 }
             .CodeRay .cv { color:#369 }
             .CodeRay .df { color:#099; font-weight:bold }
             .CodeRay .di { color:#088; font-weight:bold }
             .CodeRay .dl { color:black }
             .CodeRay .do { color:#970 }
             .CodeRay .ds { color:#D42; font-weight:bold }
             .CodeRay .e  { color:#666; font-weight:bold }
             .CodeRay .en { color:#800; font-weight:bold }
             .CodeRay .er { color:#F00; background-color:#FAA }
             .CodeRay .ex { color:#F00; font-weight:bold }
             .CodeRay .fl { color:#60E; font-weight:bold }
             .CodeRay .fu { color:#06B; font-weight:bold }
             .CodeRay .gv { color:#d70; font-weight:bold }
             .CodeRay .hx { color:#058; font-weight:bold }
             .CodeRay .i  { color:#00D; font-weight:bold }
             .CodeRay .ic { color:#B44; font-weight:bold }
             .CodeRay .il { background: #eee }
             .CodeRay .il .il { background: #ddd }
             .CodeRay .il .il .il { background: #ccc }
             .CodeRay .il .idl { font-weight: bold; color: #888 }
             .CodeRay .in { color:#B2B; font-weight:bold }
             .CodeRay .iv { color:#33B }
             .CodeRay .la { color:#970; font-weight:bold }
             .CodeRay .lv { color:#963 }
             .CodeRay .oc { color:#40E; font-weight:bold }
             .CodeRay .of { color:#000; font-weight:bold }
             .CodeRay .op { }
             .CodeRay .pc { color:#038; font-weight:bold }
             .CodeRay .pd { color:#369; font-weight:bold }
             .CodeRay .pp { color:#579 }
             .CodeRay .pt { color:#339; font-weight:bold }
             .CodeRay .r  { color:#080; font-weight:bold }
             .CodeRay .rx { background-color:#fff0ff }
             .CodeRay .rx .k { color:#808 }
             .CodeRay .rx .dl { color:#404 }
             .CodeRay .rx .mod { color:#C2C }
             .CodeRay .rx .fu  { color:#404; font-weight: bold }
             .CodeRay .s  { background-color:#fff0f0 }
             .CodeRay .s  .s { background-color:#ffe0e0 }
             .CodeRay .s  .s  .s { background-color:#ffd0d0 }
             .CodeRay .s  .k { color:#D20 }
             .CodeRay .s  .dl { color:#710 }
             .CodeRay .sh { background-color:#f0fff0 }
             .CodeRay .sh .k { color:#2B2 }
             .CodeRay .sh .dl { color:#161 }
             .CodeRay .sy { color:#A60 }
             .CodeRay .sy .k { color:#A60 }
             .CodeRay .sy .dl { color:#630 }
             .CodeRay .ta { color:#070 }
             .CodeRay .tf { color:#070; font-weight:bold }
             .CodeRay .ts { color:#D70; font-weight:bold }
             .CodeRay .ty { color:#339; font-weight:bold }
             .CodeRay .v  { color:#036 }
             .CodeRay .xt { color:#444 }

vendor/plugins/coderay-0.7.6.227/lib/coderay/encoders/html.rb +7 -1

             require "set"
             module CodeRay
             module Encoders
               # = HTML Encoder
               #
               # This is CodeRay's most important highlighter:
               # It provides save, fast XHTML generation and CSS support.
               #
               # == Usage
               #
               #  require 'coderay'
               #  puts CodeRay.scan('Some /code/', :ruby).html  #-> a HTML page
               #  puts CodeRay.scan('Some /code/', :ruby).html(:wrap => :span)
               #  #-> <span class="CodeRay"><span class="co">Some</span> /code/</span>
               #  puts CodeRay.scan('Some /code/', :ruby).span  #-> the same
               #
               #  puts CodeRay.scan('Some code', :ruby).html(
               #    :wrap => nil,
               #    :line_numbers => :inline,
               #    :css => :style
               #  )
               #  #-> <span class="no">1</span>  <span style="color:#036; font-weight:bold;">Some</span> code
               #
               # == Options
               #
+              # === :escape
+              # Escape html entities
+              # Default: true
+              #
               # === :tab_width
               # Convert \t characters to +n+ spaces (a number.)
               # Default: 8
               #
               # === :css
               # How to include the styles; can be :class or :style.
               #
               # Default: :class
               #
               # === :wrap
               # Wrap in :page, :div, :span or nil.
               #
               # You can also use Encoders::Div and Encoders::Span.
               #
               # Default: nil
               #
               # === :line_numbers
               # Include line numbers in :table, :inline, :list or nil (no line numbers)
               #
               # Default: nil
               #
               # === :line_number_start
               # Where to start with line number counting.
               #
               # Default: 1
               #
               # === :bold_every
               # Make every +n+-th number appear bold.
               #
               # Default: 10
               #
               # === :hint
               # Include some information into the output using the title attribute.
               # Can be :info (show token type on mouse-over), :info_long (with full path)
               # or :debug (via inspect).
               #
               # Default: false
               class HTML < Encoder
                 include Streamable
                 register_for :html
                 FILE_EXTENSION = 'html'
                 DEFAULT_OPTIONS = {
+                  :escape => true,
                   :tab_width => 8,
                   :level => :xhtml,
                   :css => :class,
                   :style => :cycnus,
                   :wrap => nil,
                   :line_numbers => nil,
                   :line_number_start => 1,
                   :bold_every => 10,
                   :hint => false,
                 }
                 helper :output, :css
                 attr_reader :css
               protected
                 HTML_ESCAPE = {  #:nodoc:
                   '&' => '&amp;',
                   '"' => '&quot;',
                   '>' => '&gt;',
                   '<' => '&lt;',
                 }
                 # This was to prevent illegal HTML.
                 # Strange chars should still be avoided in codes.
                 evil_chars = Array(0x00...0x20) - [?\n, ?\t, ?\s]
                 evil_chars.each { |i| HTML_ESCAPE[i.chr] = ' ' }
                 #ansi_chars = Array(0x7f..0xff)
                 #ansi_chars.each { |i| HTML_ESCAPE[i.chr] = '&#%d;' % i }
                 # \x9 (\t) and \xA (\n) not included
                 #HTML_ESCAPE_PATTERN = /[\t&"><\0-\x8\xB-\x1f\x7f-\xff]/
                 HTML_ESCAPE_PATTERN = /[\t"&><\0-\x8\xB-\x1f]/
                 TOKEN_KIND_TO_INFO = Hash.new { |h, kind|
                   h[kind] =
                     case kind
                     when :pre_constant
                       'Predefined constant'
                     else
                       kind.to_s.gsub(/_/, ' ').gsub(/\b\w/) { $&.capitalize }
                     end
                 }
                 TRANSPARENT_TOKEN_KINDS = [
                   :delimiter, :modifier, :content, :escape, :inline_delimiter,
                 ].to_set
                 # Generate a hint about the given +classes+ in a +hint+ style.
                 #
                 # +hint+ may be :info, :info_long or :debug.
                 def self.token_path_to_hint hint, classes
                   title =
                     case hint
                     when :info
                       TOKEN_KIND_TO_INFO[classes.first]
                     when :info_long
                       classes.reverse.map { |kind| TOKEN_KIND_TO_INFO[kind] }.join('/')
                     when :debug
                       classes.inspect
                     end
                   " title=\"#{title}\""
                 end
                 def setup options
                   super
                   @HTML_ESCAPE = HTML_ESCAPE.dup
                   @HTML_ESCAPE["\t"] = ' ' * options[:tab_width]
+                  @escape = options[:escape]
                   @opened = [nil]
                   @css = CSS.new options[:style]
                   hint = options[:hint]
                   if hint and not [:debug, :info, :info_long].include? hint
                     raise ArgumentError, "Unknown value %p for :hint; \
                       expected :info, :debug, false, or nil." % hint
                   end
                   case options[:css]
                   when :class
                     @css_style = Hash.new do |h, k|
                       c = Tokens::ClassOfKind[k.first]
                       if c == :NO_HIGHLIGHT and not hint
                         h[k.dup] = false
                       else
                         title = if hint
                           HTML.token_path_to_hint(hint, k[1..-1] << k.first)
                         else
                           ''
                         end
                         if c == :NO_HIGHLIGHT
                           h[k.dup] = '<span%s>' % [title]
                         else
                           h[k.dup] = '<span%s class="%s">' % [title, c]
                         end
                       end
                     end
                   when :style
                     @css_style = Hash.new do |h, k|
                       if k.is_a? ::Array
                         styles = k.dup
                       else
                         styles = [k]
                       end
                       type = styles.first
                       classes = styles.map { |c| Tokens::ClassOfKind[c] }
                       if classes.first == :NO_HIGHLIGHT and not hint
                         h[k] = false
                       else
                         styles.shift if TRANSPARENT_TOKEN_KINDS.include? styles.first
                         title = HTML.token_path_to_hint hint, styles
                         style = @css[*classes]
                         h[k] =
                           if style
                             '<span%s style="%s">' % [title, style]
                           else
                             false
                           end
                       end
                     end
                   else
                     raise ArgumentError, "Unknown value %p for :css." % options[:css]
                   end
                 end
                 def finish options
                   not_needed = @opened.shift
                   @out << '</span>' * @opened.size
                   unless @opened.empty?
                     warn '%d tokens still open: %p' % [@opened.size, @opened]
                   end
                   @out.extend Output
                   @out.css = @css
                   @out.numerize! options[:line_numbers], options
                   @out.wrap! options[:wrap]
                   super
                 end
                 def token text, type
                   if text.is_a? ::String
-                    if text =~ /#{HTML_ESCAPE_PATTERN}/o
+                    if @escape && (text =~ /#{HTML_ESCAPE_PATTERN}/o)
                       text = text.gsub(/#{HTML_ESCAPE_PATTERN}/o) { |m| @HTML_ESCAPE[m] }
                     end
                     @opened[0] = type
                     if style = @css_style[@opened]
                       @out << style << text << '</span>'
                     else
                       @out << text
                     end
                   else
                     case text
                     when :open
                       @opened[0] = type
                       @out << (@css_style[@opened] || '<span>')
                       @opened << type
                     when :close
                       if @opened.empty?
                         # nothing to close
                       else
                         if $DEBUG and (@opened.size == 1 or @opened.last != type)
                           raise 'Malformed token stream: Trying to close a token (%p) \
                             that is not open. Open are: %p.' % [type, @opened[1..-1]]
                         end
                         @out << '</span>'
                         @opened.pop
                       end
                     when nil
                       raise 'Token with nil as text was given: %p' % [[text, type]]
                     else
                       raise 'unknown token kind: %p' % text
                     end
                   end
                 end
               end
             end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages