jro_apps/redmine Commit - r1518:2af910e8e61f

Merged r1505, r1506, r1511, r1512, r1517, r1518, r1524 to 1526 from trunk....

Jean-Philippe Lang -

r1518:2af910e8e61f

parent child

Context file:

r1518:2af910e8e61f

Collapse all files

app/models/journal.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  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.
             class Journal < ActiveRecord::Base
               belongs_to :journalized, :polymorphic => true
               # added as a quick fix to allow eager loading of the polymorphic association
               # since always associated to an issue, for now
               belongs_to :issue, :foreign_key => :journalized_id
               belongs_to :user
               has_many :details, :class_name => "JournalDetail", :dependent => :delete_all
               attr_accessor :indice
               acts_as_searchable :columns => 'notes',
                                  :include => :issue,
                                  :project_key => "#{Issue.table_name}.project_id",
                                  :date_column => "#{Issue.table_name}.created_on"
-              acts_as_event :title => Proc.new {|o| "#{o.issue.tracker.name} ##{o.issue.id}: #{o.issue.subject}" + ((s = o.new_status) ? " (#{s})" : '') },
+              acts_as_event :title => Proc.new {|o| status = ((s = o.new_status) ? " (#{s})" : nil); "#{o.issue.tracker} ##{o.issue.id}#{status}: #{o.issue.subject}" },
                             :description => :notes,
                             :author => :user,
                             :type => Proc.new {|o| (s = o.new_status) && s.is_closed? ? 'issue-closed' : 'issue-edit' },
                             :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.issue.id, :anchor => "change-#{o.id}"}}
               def save
                 # Do not save an empty journal
                 (details.empty? && notes.blank?) ? false : super
               end
               # Returns the new status if the journal contains a status change, otherwise nil
               def new_status
                 c = details.detect {|detail| detail.prop_key == 'status_id'}
                 (c && c.value) ? IssueStatus.find_by_id(c.value.to_i) : nil
               end
               def new_value_for(prop)
                 c = details.detect {|detail| detail.prop_key == prop}
                 c ? c.value : nil
               end
               def editable_by?(usr)
                 usr && usr.logged? && (usr.allowed_to?(:edit_issue_notes, project) || (self.user == usr && usr.allowed_to?(:edit_own_issue_notes, project)))
               end
               def project
                 journalized.respond_to?(:project) ? journalized.project : nil
               end
               def attachments
                 journalized.respond_to?(:attachments) ? journalized.attachments : nil
               end
             end

app/models/repository/cvs.rb +2 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  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.
             require 'redmine/scm/adapters/cvs_adapter'
             require 'digest/sha1'
             class Repository::Cvs < Repository
               validates_presence_of :url, :root_url
               def scm_adapter
                 Redmine::Scm::Adapters::CvsAdapter
               end
               def self.scm_name
                 'CVS'
               end
               def entry(path, identifier)
                 e = entries(path, identifier)
                 e ? e.first : nil
               end
               def entries(path=nil, identifier=nil)
                 rev = identifier.nil? ? nil : changesets.find_by_revision(identifier)
                 entries = scm.entries(path, rev.nil? ? nil : rev.committed_on)
                 if entries
                   entries.each() do |entry|
                     unless entry.lastrev.nil? || entry.lastrev.identifier
                       change=changes.find_by_revision_and_path( entry.lastrev.revision, scm.with_leading_slash(entry.path) )
                       if change
                         entry.lastrev.identifier=change.changeset.revision
                         entry.lastrev.author=change.changeset.committer
                         entry.lastrev.revision=change.revision
                         entry.lastrev.branch=change.branch
                       end
                     end
                   end
                 end
                 entries
               end
               def diff(path, rev, rev_to, type)
                 #convert rev to revision. CVS can't handle changesets here
                 diff=[]
                 changeset_from=changesets.find_by_revision(rev)
                 if rev_to.to_i > 0
                   changeset_to=changesets.find_by_revision(rev_to)
                 end
                 changeset_from.changes.each() do |change_from|
                   revision_from=nil
                   revision_to=nil
                   revision_from=change_from.revision if path.nil? || (change_from.path.starts_with? scm.with_leading_slash(path))
                   if revision_from
                     if changeset_to
                       changeset_to.changes.each() do |change_to|
                         revision_to=change_to.revision if change_to.path==change_from.path
                       end
                     end
                     unless revision_to
                       revision_to=scm.get_previous_revision(revision_from)
                     end
-                    diff=diff+scm.diff(change_from.path, revision_from, revision_to, type)
+                    file_diff = scm.diff(change_from.path, revision_from, revision_to)
+                    diff = diff + file_diff unless file_diff.nil?
                   end
                 end
                 return diff
               end
               def fetch_changesets
                 # some nifty bits to introduce a commit-id with cvs
                 # natively cvs doesn't provide any kind of changesets, there is only a revision per file.
                 # we now take a guess using the author, the commitlog and the commit-date.
                 # last one is the next step to take. the commit-date is not equal for all
                 # commits in one changeset. cvs update the commit-date when the *,v file was touched. so
                 # we use a small delta here, to merge all changes belonging to _one_ changeset
                 time_delta=10.seconds
                 fetch_since = latest_changeset ? latest_changeset.committed_on : nil
                 transaction do
                   tmp_rev_num = 1
                   scm.revisions('', fetch_since, nil, :with_paths => true) do |revision|
                     # only add the change to the database, if it doen't exists. the cvs log
                     # is not exclusive at all.
                     unless changes.find_by_path_and_revision(scm.with_leading_slash(revision.paths[0][:path]), revision.paths[0][:revision])
                       revision
                       cs = changesets.find(:first, :conditions=>{
                         :committed_on=>revision.time-time_delta..revision.time+time_delta,
                         :committer=>revision.author,
                         :comments=>revision.message
                       })
                       # create a new changeset....
                       unless cs
                         # we use a temporaray revision number here (just for inserting)
                         # later on, we calculate a continous positive number
                         latest = changesets.find(:first, :order => 'id DESC')
                         cs = Changeset.create(:repository => self,
                                               :revision => "_#{tmp_rev_num}",
                                               :committer => revision.author,
                                               :committed_on => revision.time,
                                               :comments => revision.message)
                         tmp_rev_num += 1
                       end
                       #convert CVS-File-States to internal Action-abbrevations
                       #default action is (M)odified
                       action="M"
                       if revision.paths[0][:action]=="Exp" && revision.paths[0][:revision]=="1.1"
                         action="A" #add-action always at first revision (= 1.1)
                       elsif revision.paths[0][:action]=="dead"
                         action="D" #dead-state is similar to Delete
                       end
                       Change.create(:changeset => cs,
                       :action => action,
                       :path => scm.with_leading_slash(revision.paths[0][:path]),
                       :revision => revision.paths[0][:revision],
                       :branch => revision.paths[0][:branch]
                       )
                     end
                   end
                   # Renumber new changesets in chronological order
                   changesets.find(:all, :order => 'committed_on ASC, id ASC', :conditions => "revision LIKE '_%'").each do |changeset|
                     changeset.update_attribute :revision, next_revision_number
                   end
                 end # transaction
               end
               private
               # Returns the next revision number to assign to a CVS changeset
               def next_revision_number
                 # Need to retrieve existing revision numbers to sort them as integers
                 @current_revision_number ||= (connection.select_values("SELECT revision FROM #{Changeset.table_name} WHERE repository_id = #{id} AND revision NOT LIKE '_%'").collect(&:to_i).max || 0)
                 @current_revision_number += 1
               end
             end

app/views/layouts/base.rhtml +1 -1

             <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
             <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
             <head>
             <title><%=h html_title %></title>
             <meta http-equiv="content-type" content="text/html; charset=utf-8" />
             <meta name="description" content="<%= Redmine::Info.app_name %>" />
             <meta name="keywords" content="issue,bug,tracker" />
             <%= stylesheet_link_tag 'application', :media => 'all' %>
             <%= javascript_include_tag :defaults %>
             <%= stylesheet_link_tag 'jstoolbar' %>
             <!--[if IE]>
                 <style type="text/css">
                   * html body{ width: expression( document.documentElement.clientWidth < 900 ? '900px' : '100%' ); }
                   body {behavior: url(<%= stylesheet_path "csshover.htc" %>);}
                 </style>
             <![endif]-->
             <!-- page specific tags --><%= yield :header_tags %>
             </head>
             <body>
             <div id="wrapper">
             <div id="top-menu">
                 <div id="account">
                     <%= render_menu :account_menu -%>
                 </div>
                 <%= content_tag('div', "#{l(:label_logged_as)} #{User.current.login}", :id => 'loggedas') if User.current.logged? %>
                 <%= render_menu :top_menu -%>
             </div>
             <div id="header">
                 <div id="quick-search">
                     <% form_tag({:controller => 'search', :action => 'index', :id => @project}, :method => :get ) do %>
                     <%= link_to l(:label_search), {:controller => 'search', :action => 'index', :id => @project}, :accesskey => accesskey(:search) %>:
                     <%= text_field_tag 'q', @question, :size => 20, :class => 'small', :accesskey => accesskey(:quick_search) %>
                     <% end %>
                     <%= render :partial => 'layouts/project_selector' if User.current.memberships.any? %>
                 </div>
-                <h1><%= h(@project ? @project.name : Setting.app_title) %></h1>
+                <h1><%= h(@project && !@project.new_record? ? @project.name : Setting.app_title) %></h1>
                 <div id="main-menu">
                     <%= render_main_menu(@project) %>
                 </div>
             </div>
             <%= tag('div', {:id => 'main', :class => (has_content?(:sidebar) ? '' : 'nosidebar')}, true) %>
                 <div id="sidebar">
                     <%= yield :sidebar %>
                 </div>
                 <div id="content">
                         <%= content_tag('div', flash[:error], :class => 'flash error') if flash[:error] %>
                         <%= content_tag('div', flash[:notice], :class => 'flash notice') if flash[:notice] %>
                     <%= yield %>
                 </div>
             </div>
             <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
             <div id="footer">
                 Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2008 Jean-Philippe Lang
             </div>
             </div>
             </body>
             </html>

app/views/repositories/_dir_list_content.rhtml +1 -1

             <% @entries.each do |entry| %>
             <% tr_id = Digest::MD5.hexdigest(entry.path)
                depth = params[:depth].to_i %>
             <tr id="<%= tr_id %>" class="<%= params[:parent_id] %> entry">
             <td class="filename">
             <%= if entry.is_dir?
               link_to_remote h(entry.name),
                              {:url => {:action => 'browse', :id => @project, :path => entry.path, :rev => @rev, :depth => (depth + 1), :parent_id => tr_id},
                               :update => { :success => tr_id },
                               :position => :after,
                               :success => "scmEntryLoaded('#{tr_id}')",
                               :condition => "scmEntryClick('#{tr_id}')"
                              },
                              {:href => url_for({:action => 'browse', :id => @project, :path => entry.path, :rev => @rev}),
                               :class => ('icon icon-folder'),
                               :style => "margin-left: #{18 * depth}px;"
                              }
             else
               link_to h(entry.name),
                       {:action => (entry.is_dir? ? 'browse' : 'changes'), :id => @project, :path => entry.path, :rev => @rev},
                       :class => 'icon icon-file',
                       :style => "margin-left: #{18 * depth}px;"
             end %>
             </td>
             <td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
             <td class="revision"><%= link_to(format_revision(entry.lastrev.name), :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %></td>
             <td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
             <td class="author"><%=h(entry.lastrev.author.to_s.split('<').first) if entry.lastrev %></td>
-            <% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev %>
+            <% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %>
             <td class="comments"><%=h truncate(changeset.comments, 50) unless changeset.nil? %></td>
             </tr>
             <% end %>

app/views/repositories/changes.rhtml +2 -1

             <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => (@entry ? @entry.kind : nil), :revision => @rev } %></h2>
             <h3><%=h @entry.name %></h3>
             <p>
             <% if @repository.supports_cat? %>
                 <%= link_to l(:button_view), {:action => 'entry', :id => @project, :path => @path, :rev => @rev } %> |
             <% end %>
             <% if @repository.supports_annotate? %>
                 <%= link_to l(:button_annotate), {:action => 'annotate', :id => @project, :path => @path, :rev => @rev } %> |
             <% end %>
             <%= link_to(l(:button_download), {:action => 'entry', :id => @project, :path => @path, :rev => @rev, :format => 'raw' }) if @repository.supports_cat? %>
             <%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
             </p>
-            <%= render :partial => 'revisions', :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }%>
+            <%= render(:partial => 'revisions',
+                       :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }) unless @changesets.empty? %>
             <% html_title(l(:label_change_plural)) -%>

lib/SVG/Graph/Graph.rb +1 -1

             begin
               require 'zlib'
               @@__have_zlib = true
             rescue
               @@__have_zlib = false
             end
             require 'rexml/document'
             module SVG
               module Graph
                 VERSION = '@ANT_VERSION@'
                 # === Base object for generating SVG Graphs
                 #
                 # == Synopsis
                 #
                 # This class is only used as a superclass of specialized charts.  Do not
                 # attempt to use this class directly, unless creating a new chart type.
                 #
                 # For examples of how to subclass this class, see the existing specific
                 # subclasses, such as SVG::Graph::Pie.
                 #
                 # == Examples
                 #
                 # For examples of how to use this package, see either the test files, or
                 # the documentation for the specific class you want to use.
                 #
                 # * file:test/plot.rb
                 # * file:test/single.rb
                 # * file:test/test.rb
                 # * file:test/timeseries.rb
                 #
                 # == Description
                 #
                 # This package should be used as a base for creating SVG graphs.
                 #
                 # == Acknowledgements
                 #
                 # Leo Lapworth for creating the SVG::TT::Graph package which this Ruby
                 # port is based on.
                 #
                 # Stephen Morgan for creating the TT template and SVG.
                 #
                 # == See
                 #
                 # * SVG::Graph::BarHorizontal
                 # * SVG::Graph::Bar
                 # * SVG::Graph::Line
                 # * SVG::Graph::Pie
                 # * SVG::Graph::Plot
                 # * SVG::Graph::TimeSeries
                 #
                 # == Author
                 #
                 # Sean E. Russell <serATgermaneHYPHENsoftwareDOTcom>
                 #
                 # Copyright 2004 Sean E. Russell
                 # This software is available under the Ruby license[LICENSE.txt]
                 #
                 class Graph
                   include REXML
                   # Initialize the graph object with the graph settings.  You won't
                   # instantiate this class directly; see the subclass for options.
                   # [width] 500
                   # [height] 300
                   # [show_x_guidelines] false
                   # [show_y_guidelines] true
                   # [show_data_values] true
                   # [min_scale_value] 0
                   # [show_x_labels] true
                   # [stagger_x_labels] false
                   # [rotate_x_labels] false
                   # [step_x_labels] 1
                   # [step_include_first_x_label] true
                   # [show_y_labels] true
                   # [rotate_y_labels] false
                   # [scale_integers] false
                   # [show_x_title] false
                   # [x_title] 'X Field names'
                   # [show_y_title] false
                   # [y_title_text_direction] :bt
                   # [y_title] 'Y Scale'
                   # [show_graph_title] false
                   # [graph_title] 'Graph Title'
                   # [show_graph_subtitle] false
                   # [graph_subtitle] 'Graph Sub Title'
                   # [key] true,
                   # [key_position] :right, # bottom or righ
                   # [font_size] 12
                   # [title_font_size] 16
                   # [subtitle_font_size] 14
                   # [x_label_font_size] 12
                   # [x_title_font_size] 14
                   # [y_label_font_size] 12
                   # [y_title_font_size] 14
                   # [key_font_size] 10
                   # [no_css] false
                   # [add_popups] false
                   def initialize( config )
                     @config = config
                     self.top_align = self.top_font = self.right_align = self.right_font = 0
                     init_with({
                       :width                => 500,
                       :height               => 300,
                       :show_x_guidelines    => false,
                       :show_y_guidelines    => true,
                       :show_data_values     => true,
                       :min_scale_value      => 0,
                       :show_x_labels        => true,
                       :stagger_x_labels     => false,
                       :rotate_x_labels      => false,
                       :step_x_labels        => 1,
                       :step_include_first_x_label => true,
                       :show_y_labels        => true,
                       :rotate_y_labels      => false,
                       :stagger_y_labels     => false,
                       :scale_integers       => false,
                       :show_x_title         => false,
                       :x_title              => 'X Field names',
                       :show_y_title         => false,
                       :y_title_text_direction => :bt,
                       :y_title              => 'Y Scale',
                       :show_graph_title      => false,
                       :graph_title          => 'Graph Title',
                       :show_graph_subtitle  => false,
                       :graph_subtitle        => 'Graph Sub Title',
                       :key                  => true,
                       :key_position          => :right, # bottom or right
                       :font_size            =>10,
                       :title_font_size      =>12,
                       :subtitle_font_size   =>14,
                       :x_label_font_size    =>11,
                       :x_title_font_size    =>14,
                       :y_label_font_size    =>11,
                       :y_title_font_size    =>14,
                       :key_font_size        => 9,
                       :no_css               =>false,
                       :add_popups           =>false,
                     })
             				set_defaults if methods.include? "set_defaults"
                     init_with config
                   end
                   # This method allows you do add data to the graph object.
                   # It can be called several times to add more data sets in.
                   #
                   #   data_sales_02 = [12, 45, 21];
                   #
                   #   graph.add_data({
                   #     :data => data_sales_02,
                   #     :title => 'Sales 2002'
                   #   })
                   def add_data conf
                     @data = [] unless defined? @data
                     if conf[:data] and conf[:data].kind_of? Array
                       @data << conf
                     else
                       raise "No data provided by #{conf.inspect}"
                     end
                   end
                   # This method removes all data from the object so that you can
                   # reuse it to create a new graph but with the same config options.
                   #
                   #   graph.clear_data
                   def clear_data
                     @data = []
                   end
                   # This method processes the template with the data and
                   # config which has been set and returns the resulting SVG.
                   #
                   # This method will croak unless at least one data set has
                   # been added to the graph object.
                   #
                   #   print graph.burn
                   def burn
                     raise "No data available" unless @data.size > 0
                     calculations if methods.include? 'calculations'
                     start_svg
                     calculate_graph_dimensions
                     @foreground = Element.new( "g" )
                     draw_graph
                     draw_titles
                     draw_legend
                     draw_data
                     @graph.add_element( @foreground )
                     style
                     data = ""
                     @doc.write( data, 0 )
                     if @config[:compress]
                       if @@__have_zlib
                         inp, out = IO.pipe
                         gz = Zlib::GzipWriter.new( out )
                         gz.write data
                         gz.close
                         data = inp.read
                       else
                         data << "<!-- Ruby Zlib not available for SVGZ -->";
                       end
                     end
                     return data
                   end
                   #   Set the height of the graph box, this is the total height
                   #   of the SVG box created - not the graph it self which auto
                   #   scales to fix the space.
                   attr_accessor :height
                   #   Set the width of the graph box, this is the total width
                   #   of the SVG box created - not the graph it self which auto
                   #   scales to fix the space.
                   attr_accessor :width
                   #   Set the path to an external stylesheet, set to '' if
                   #   you want to revert back to using the defaut internal version.
                   #
                   #   To create an external stylesheet create a graph using the
                   #   default internal version and copy the stylesheet section to
                   #   an external file and edit from there.
                   attr_accessor :style_sheet
                   #   (Bool) Show the value of each element of data on the graph
                   attr_accessor :show_data_values
                   #   The point at which the Y axis starts, defaults to '0',
                   #   if set to nil it will default to the minimum data value.
                   attr_accessor :min_scale_value
                   #   Whether to show labels on the X axis or not, defaults
                   #   to true, set to false if you want to turn them off.
                   attr_accessor :show_x_labels
                   #   This puts the X labels at alternative levels so if they
                   #   are long field names they will not overlap so easily.
                   #   Default it false, to turn on set to true.
                   attr_accessor :stagger_x_labels
                   #   This puts the Y labels at alternative levels so if they
                   #   are long field names they will not overlap so easily.
                   #   Default it false, to turn on set to true.
                   attr_accessor :stagger_y_labels
                   #   This turns the X axis labels by 90 degrees.
                   #   Default it false, to turn on set to true.
                   attr_accessor :rotate_x_labels
                   #   This turns the Y axis labels by 90 degrees.
                   #   Default it false, to turn on set to true.
                   attr_accessor :rotate_y_labels
                   #   How many "steps" to use between displayed X axis labels,
                   #   a step of one means display every label, a step of two results
                   #   in every other label being displayed (label <gap> label <gap> label),
                   #   a step of three results in every third label being displayed
                   #   (label <gap> <gap> label <gap> <gap> label) and so on.
                   attr_accessor :step_x_labels
                   #   Whether to (when taking "steps" between X axis labels) step from
                   #   the first label (i.e. always include the first label) or step from
                   #   the X axis origin (i.e. start with a gap if step_x_labels is greater
                   #   than one).
                   attr_accessor :step_include_first_x_label
                   #   Whether to show labels on the Y axis or not, defaults
                   #   to true, set to false if you want to turn them off.
                   attr_accessor :show_y_labels
                   #   Ensures only whole numbers are used as the scale divisions.
                   #   Default it false, to turn on set to true. This has no effect if
                   #   scale divisions are less than 1.
                   attr_accessor :scale_integers
                   #   This defines the gap between markers on the Y axis,
                   #   default is a 10th of the max_value, e.g. you will have
                   #   10 markers on the Y axis. NOTE: do not set this too
                   #   low - you are limited to 999 markers, after that the
                   #   graph won't generate.
                   attr_accessor :scale_divisions
                   #   Whether to show the title under the X axis labels,
                   #   default is false, set to true to show.
                   attr_accessor :show_x_title
                   #   What the title under X axis should be, e.g. 'Months'.
                   attr_accessor :x_title
                   #   Whether to show the title under the Y axis labels,
                   #   default is false, set to true to show.
                   attr_accessor :show_y_title
                   #   Aligns writing mode for Y axis label.
                   #   Defaults to :bt (Bottom to Top).
                   #   Change to :tb (Top to Bottom) to reverse.
                   attr_accessor :y_title_text_direction
                   #   What the title under Y axis should be, e.g. 'Sales in thousands'.
                   attr_accessor :y_title
                   #   Whether to show a title on the graph, defaults
                   #   to false, set to true to show.
                   attr_accessor :show_graph_title
                   #   What the title on the graph should be.
                   attr_accessor :graph_title
                   #   Whether to show a subtitle on the graph, defaults
                   #   to false, set to true to show.
                   attr_accessor :show_graph_subtitle
                   #   What the subtitle on the graph should be.
                   attr_accessor :graph_subtitle
                   #   Whether to show a key, defaults to false, set to
                   #   true if you want to show it.
                   attr_accessor :key
                   #   Where the key should be positioned, defaults to
                   #   :right, set to :bottom if you want to move it.
                   attr_accessor :key_position
                   # Set the font size (in points) of the data point labels
                   attr_accessor :font_size
                   # Set the font size of the X axis labels
                   attr_accessor :x_label_font_size
                   # Set the font size of the X axis title
                   attr_accessor :x_title_font_size
                   # Set the font size of the Y axis labels
                   attr_accessor :y_label_font_size
                   # Set the font size of the Y axis title
                   attr_accessor :y_title_font_size
                   # Set the title font size
                   attr_accessor :title_font_size
                   # Set the subtitle font size
                   attr_accessor :subtitle_font_size
                   # Set the key font size
                   attr_accessor :key_font_size
                   # Show guidelines for the X axis
                   attr_accessor :show_x_guidelines
                   # Show guidelines for the Y axis
                   attr_accessor :show_y_guidelines
                   # Do not use CSS if set to true.  Many SVG viewers do not support CSS, but
                   # not using CSS can result in larger SVGs as well as making it impossible to
                   # change colors after the chart is generated.  Defaults to false.
                   attr_accessor :no_css
                   # Add popups for the data points on some graphs
                   attr_accessor :add_popups
                   protected
                   def sort( *arrys )
                     sort_multiple( arrys )
                   end
                   # Overwrite configuration options with supplied options.  Used
                   # by subclasses.
                   def init_with config
                     config.each { |key, value|
                       self.send( key.to_s+"=", value ) if methods.include? key.to_s
                     }
                   end
                   attr_accessor :top_align, :top_font, :right_align, :right_font
                   KEY_BOX_SIZE = 12
                   # Override this (and call super) to change the margin to the left
                   # of the plot area.  Results in @border_left being set.
                   def calculate_left_margin
                     @border_left = 7
                     # Check for Y labels
                     max_y_label_height_px = rotate_y_labels ?
                       y_label_font_size :
                       get_y_labels.max{|a,b|
                         a.to_s.length<=>b.to_s.length
                       }.to_s.length * y_label_font_size * 0.6
                     @border_left += max_y_label_height_px if show_y_labels
                     @border_left += max_y_label_height_px + 10 if stagger_y_labels
                     @border_left += y_title_font_size + 5 if show_y_title
                   end
                   # Calculates the width of the widest Y label.  This will be the
                   # character height if the Y labels are rotated
                   def max_y_label_width_px
                     return font_size if rotate_y_labels
                   end
                   # Override this (and call super) to change the margin to the right
                   # of the plot area.  Results in @border_right being set.
                   def calculate_right_margin
                     @border_right = 7
                     if key and key_position == :right
                       val = keys.max { |a,b| a.length <=> b.length }
                       @border_right += val.length * key_font_size * 0.7
                       @border_right += KEY_BOX_SIZE
                       @border_right += 10    # Some padding around the box
                     end
                   end
                   # Override this (and call super) to change the margin to the top
                   # of the plot area.  Results in @border_top being set.
                   def calculate_top_margin
                     @border_top = 5
                     @border_top += title_font_size if show_graph_title
                     @border_top += 5
                     @border_top += subtitle_font_size if show_graph_subtitle
                   end
                   # Adds pop-up point information to a graph.
                   def add_popup( x, y, label )
                     txt_width = label.length * font_size * 0.6 + 10
                     tx = (x+txt_width > width ? x-5 : x+5)
                     t = @foreground.add_element( "text", {
                       "x" => tx.to_s,
                       "y" => (y - font_size).to_s,
                       "visibility" => "hidden",
                     })
                     t.attributes["style"] = "fill: #000; "+
                       (x+txt_width > width ? "text-anchor: end;" : "text-anchor: start;")
                     t.text = label.to_s
                     t.attributes["id"] = t.id.to_s
                     @foreground.add_element( "circle", {
                       "cx" => x.to_s,
                       "cy" => y.to_s,
                       "r" => "10",
                       "style" => "opacity: 0",
                       "onmouseover" =>
                         "document.getElementById(#{t.id}).setAttribute('visibility', 'visible' )",
                       "onmouseout" =>
                         "document.getElementById(#{t.id}).setAttribute('visibility', 'hidden' )",
                     })
                   end
                   # Override this (and call super) to change the margin to the bottom
                   # of the plot area.  Results in @border_bottom being set.
                   def calculate_bottom_margin
                     @border_bottom = 7
                     if key and key_position == :bottom
                       @border_bottom += @data.size * (font_size + 5)
                       @border_bottom += 10
                     end
                     if show_x_labels
                       max_x_label_height_px = rotate_x_labels ?
                         get_x_labels.max{|a,b|
                           a.length<=>b.length
                         }.length * x_label_font_size * 0.6 :
                         x_label_font_size
                       @border_bottom += max_x_label_height_px
                       @border_bottom += max_x_label_height_px + 10 if stagger_x_labels
                     end
                     @border_bottom += x_title_font_size + 5 if show_x_title
                   end
                   # Draws the background, axis, and labels.
                   def draw_graph
                     @graph = @root.add_element( "g", {
                       "transform" => "translate( #@border_left #@border_top )"
                     })
                     # Background
                     @graph.add_element( "rect", {
                       "x" => "0",
                       "y" => "0",
                       "width" => @graph_width.to_s,
                       "height" => @graph_height.to_s,
                       "class" => "graphBackground"
                     })
                     # Axis
                     @graph.add_element( "path", {
                       "d" => "M 0 0 v#@graph_height",
                       "class" => "axis",
                       "id" => "xAxis"
                     })
                     @graph.add_element( "path", {
                       "d" => "M 0 #@graph_height h#@graph_width",
                       "class" => "axis",
                       "id" => "yAxis"
                     })
                     draw_x_labels
                     draw_y_labels
                   end
                   # Where in the X area the label is drawn
                   # Centered in the field, should be width/2.  Start, 0.
                   def x_label_offset( width )
                   end
                   def make_datapoint_text( x, y, value, style="" )
                     if show_data_values
                       @foreground.add_element( "text", {
                         "x" => x.to_s,
                         "y" => y.to_s,
                         "class" => "dataPointLabel",
                         "style" => "#{style} stroke: #fff; stroke-width: 2;"
                       }).text = value.to_s
                       text = @foreground.add_element( "text", {
                         "x" => x.to_s,
                         "y" => y.to_s,
                         "class" => "dataPointLabel"
                       })
                       text.text = value.to_s
                       text.attributes["style"] = style if style.length > 0
                     end
                   end
                   # Draws the X axis labels
                   def draw_x_labels
                     stagger = x_label_font_size + 5
                     if show_x_labels
                       label_width = field_width
                       count = 0
                       for label in get_x_labels
                         if step_include_first_x_label == true then
                           step = count % step_x_labels
                         else
                           step = (count + 1) % step_x_labels
                         end
                         if step == 0 then
                           text = @graph.add_element( "text" )
                           text.attributes["class"] = "xAxisLabels"
                           text.text = label.to_s
                           x = count * label_width + x_label_offset( label_width )
                           y = @graph_height + x_label_font_size + 3
                           t = 0 - (font_size / 2)
                           if stagger_x_labels and count % 2 == 1
                             y += stagger
                             @graph.add_element( "path", {
                               "d" => "M#{x} #@graph_height v#{stagger}",
                               "class" => "staggerGuideLine"
                             })
                           end
                           text.attributes["x"] = x.to_s
                           text.attributes["y"] = y.to_s
                           if rotate_x_labels
                             text.attributes["transform"] =
                               "rotate( 90 #{x} #{y-x_label_font_size} )"+
                               " translate( 0 -#{x_label_font_size/4} )"
                             text.attributes["style"] = "text-anchor: start"
                           else
                             text.attributes["style"] = "text-anchor: middle"
                           end
                         end
                         draw_x_guidelines( label_width, count ) if show_x_guidelines
                         count += 1
                       end
                     end
                   end
                   # Where in the Y area the label is drawn
                   # Centered in the field, should be width/2.  Start, 0.
                   def y_label_offset( height )
                   end
                   def field_width
                     (@graph_width.to_f - font_size*2*right_font) /
                        (get_x_labels.length - right_align)
                   end
                   def field_height
                     (@graph_height.to_f - font_size*2*top_font) /
                        (get_y_labels.length - top_align)
                   end
                   # Draws the Y axis labels
                   def draw_y_labels
                     stagger = y_label_font_size + 5
                     if show_y_labels
                       label_height = field_height
                       count = 0
                       y_offset = @graph_height + y_label_offset( label_height )
                       y_offset += font_size/1.2 unless rotate_y_labels
                       for label in get_y_labels
                         y = y_offset - (label_height * count)
                         x = rotate_y_labels ? 0 : -3
                         if stagger_y_labels and count % 2 == 1
                           x -= stagger
                           @graph.add_element( "path", {
                             "d" => "M#{x} #{y} h#{stagger}",
                             "class" => "staggerGuideLine"
                           })
                         end
                         text = @graph.add_element( "text", {
                           "x" => x.to_s,
                           "y" => y.to_s,
                           "class" => "yAxisLabels"
                         })
                         text.text = label.to_s
                         if rotate_y_labels
                           text.attributes["transform"] = "translate( -#{font_size} 0 ) "+
                             "rotate( 90 #{x} #{y} ) "
                           text.attributes["style"] = "text-anchor: middle"
                         else
                           text.attributes["y"] = (y - (y_label_font_size/2)).to_s
                           text.attributes["style"] = "text-anchor: end"
                         end
                         draw_y_guidelines( label_height, count ) if show_y_guidelines
                         count += 1
                       end
                     end
                   end
                   # Draws the X axis guidelines
                   def draw_x_guidelines( label_height, count )
                     if count != 0
                       @graph.add_element( "path", {
                         "d" => "M#{label_height*count} 0 v#@graph_height",
                         "class" => "guideLines"
                       })
                     end
                   end
                   # Draws the Y axis guidelines
                   def draw_y_guidelines( label_height, count )
                     if count != 0
                       @graph.add_element( "path", {
                         "d" => "M0 #{@graph_height-(label_height*count)} h#@graph_width",
                         "class" => "guideLines"
                       })
                     end
                   end
                   # Draws the graph title and subtitle
                   def draw_titles
                     if show_graph_title
                       @root.add_element( "text", {
                         "x" => (width / 2).to_s,
                         "y" => (title_font_size).to_s,
                         "class" => "mainTitle"
                       }).text = graph_title.to_s
                     end
                     if show_graph_subtitle
                       y_subtitle = show_graph_title ?
                         title_font_size + 10 :
                         subtitle_font_size
                       @root.add_element("text", {
                         "x" => (width / 2).to_s,
                         "y" => (y_subtitle).to_s,
                         "class" => "subTitle"
                       }).text = graph_subtitle.to_s
                     end
                     if show_x_title
                       y = @graph_height + @border_top + x_title_font_size
                       if show_x_labels
                         y += x_label_font_size + 5 if stagger_x_labels
                         y += x_label_font_size + 5
                       end
                       x = width / 2
                       @root.add_element("text", {
                         "x" => x.to_s,
                         "y" => y.to_s,
                         "class" => "xAxisTitle",
                       }).text = x_title.to_s
                     end
                     if show_y_title
                       x = y_title_font_size + (y_title_text_direction==:bt ? 3 : -3)
                       y = height / 2
                       text = @root.add_element("text", {
                         "x" => x.to_s,
                         "y" => y.to_s,
                         "class" => "yAxisTitle",
                       })
                       text.text = y_title.to_s
                       if y_title_text_direction == :bt
                         text.attributes["transform"] = "rotate( -90, #{x}, #{y} )"
                       else
                         text.attributes["transform"] = "rotate( 90, #{x}, #{y} )"
                       end
                     end
                   end
                   def keys
                     return @data.collect{ |d| d[:title] }
                   end
                   # Draws the legend on the graph
                   def draw_legend
                     if key
                       group = @root.add_element( "g" )
                       key_count = 0
                       for key_name in keys
                         y_offset = (KEY_BOX_SIZE * key_count) + (key_count * 5)
                         group.add_element( "rect", {
                           "x" => 0.to_s,
                           "y" => y_offset.to_s,
                           "width" => KEY_BOX_SIZE.to_s,
                           "height" => KEY_BOX_SIZE.to_s,
                           "class" => "key#{key_count+1}"
                         })
                         group.add_element( "text", {
                           "x" => (KEY_BOX_SIZE + 5).to_s,
                           "y" => (y_offset + KEY_BOX_SIZE - 2).to_s,
                           "class" => "keyText"
                         }).text = key_name.to_s
                         key_count += 1
                       end
                       case key_position
                       when :right
                         x_offset = @graph_width + @border_left + 10
                         y_offset = @border_top + 20
                       when :bottom
                         x_offset = @border_left + 20
                         y_offset = @border_top + @graph_height + 5
                         if show_x_labels
                           max_x_label_height_px = rotate_x_labels ?
                             get_x_labels.max{|a,b|
                               a.length<=>b.length
                             }.length * x_label_font_size :
                             x_label_font_size
                           y_offset += max_x_label_height_px
                           y_offset += max_x_label_height_px + 5 if stagger_x_labels
                         end
                         y_offset += x_title_font_size + 5 if show_x_title
                       end
                       group.attributes["transform"] = "translate(#{x_offset} #{y_offset})"
                     end
                   end
                   private
                   def sort_multiple( arrys, lo=0, hi=arrys[0].length-1 )
                     if lo < hi
                       p = partition(arrys,lo,hi)
                       sort_multiple(arrys, lo, p-1)
                       sort_multiple(arrys, p+1, hi)
                     end
                     arrys
                   end
                   def partition( arrys, lo, hi )
                     p = arrys[0][lo]
                     l = lo
                     z = lo+1
                     while z <= hi
                       if arrys[0][z] < p
                         l += 1
                         arrys.each { |arry| arry[z], arry[l] = arry[l], arry[z] }
                       end
                       z += 1
                     end
                     arrys.each { |arry| arry[lo], arry[l] = arry[l], arry[lo] }
                     l
                   end
                   def style
                     if no_css
                       styles = parse_css
                       @root.elements.each("//*[@class]") { |el|
                         cl = el.attributes["class"]
                         style = styles[cl]
                         style += el.attributes["style"] if el.attributes["style"]
                         el.attributes["style"] = style
                       }
                     end
                   end
                   def parse_css
                     css = get_style
                     rv = {}
                     while css =~ /^(\.(\w+)(?:\s*,\s*\.\w+)*)\s*\{/m
                       names_orig = names = $1
                       css = $'
                       css =~ /([^}]+)\}/m
                       content = $1
                       css = $'
                       nms = []
                       while names =~ /^\s*,?\s*\.(\w+)/
                         nms << $1
                         names = $'
                       end
                       content = content.tr( "\n\t", " ")
                       for name in nms
                         current = rv[name]
                         current = current ? current+"; "+content : content
                         rv[name] = current.strip.squeeze(" ")
                       end
                     end
                     return rv
                   end
                   # Override and place code to add defs here
                   def add_defs defs
                   end
                   def start_svg
                     # Base document
                     @doc = Document.new
                     @doc << XMLDecl.new
                     @doc << DocType.new( %q{svg PUBLIC "-//W3C//DTD SVG 1.0//EN" } +
                       %q{"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"} )
                     if style_sheet && style_sheet != ''
-                      @doc << ProcessingInstruction.new( "xml-stylesheet",
+                      @doc << Instruction.new( "xml-stylesheet",
                         %Q{href="#{style_sheet}" type="text/css"} )
                     end
                     @root = @doc.add_element( "svg", {
                       "width" => width.to_s,
                       "height" => height.to_s,
                       "viewBox" => "0 0 #{width} #{height}",
                       "xmlns" => "http://www.w3.org/2000/svg",
                       "xmlns:xlink" => "http://www.w3.org/1999/xlink",
                       "xmlns:a3" => "http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/",
                       "a3:scriptImplementation" => "Adobe"
                     })
                     @root << Comment.new( " "+"\\"*66 )
                     @root << Comment.new( " Created with SVG::Graph " )
                     @root << Comment.new( " SVG::Graph by Sean E. Russell " )
                     @root << Comment.new( " Losely based on SVG::TT::Graph for Perl by"+
                     " Leo Lapworth & Stephan Morgan " )
                     @root << Comment.new( " "+"/"*66 )
                     defs = @root.add_element( "defs" )
                     add_defs defs
                     if not(style_sheet && style_sheet != '') and !no_css
                       @root << Comment.new(" include default stylesheet if none specified ")
                       style = defs.add_element( "style", {"type"=>"text/css"} )
                       style << CData.new( get_style )
                     end
                     @root << Comment.new( "SVG Background" )
                     @root.add_element( "rect", {
                       "width" => width.to_s,
                       "height" => height.to_s,
                       "x" => "0",
                       "y" => "0",
                       "class" => "svgBackground"
                     })
                   end
                   def calculate_graph_dimensions
                     calculate_left_margin
                     calculate_right_margin
                     calculate_bottom_margin
                     calculate_top_margin
                     @graph_width = width - @border_left - @border_right
                     @graph_height = height - @border_top - @border_bottom
                   end
                   def get_style
                     return <<EOL
             /* Copy from here for external style sheet */
             .svgBackground{
               fill:#ffffff;
             }
             .graphBackground{
               fill:#f5f5f5;
             }
             /* graphs titles */
             .mainTitle{
               text-anchor: middle;
               fill: #555555;
               font-size: #{title_font_size}px;
               font-family: "Verdana", sans-serif;
               font-weight: bold;
             }
             .subTitle{
               text-anchor: middle;
               fill: #999999;
               font-size: #{subtitle_font_size}px;
               font-family: "Verdana", sans-serif;
               font-weight: normal;
             }
             .axis{
               stroke: #666666;
               stroke-width: 1px;
             }
             .guideLines{
               stroke: #666666;
               stroke-width: 1px;
               stroke-dasharray:2,2,2;
             }
             .xAxisLabels{
               text-anchor: middle;
               fill: #000000;
               font-size: #{x_label_font_size}px;
               font-family: "Verdana", sans-serif;
               font-weight: normal;
             }
             .yAxisLabels{
               text-anchor: end;
               fill: #000000;
               font-size: #{y_label_font_size}px;
               font-family: "Verdana", sans-serif;
               font-weight: normal;
             }
             .xAxisTitle{
               text-anchor: middle;
               fill: #ff0000;
               font-size: #{x_title_font_size}px;
               font-family: "Verdana", sans-serif;
               font-weight: normal;
             }
             .yAxisTitle{
               fill: #ff0000;
               text-anchor: middle;
               font-size: #{y_title_font_size}px;
               font-family: "Verdana", sans-serif;
               font-weight: normal;
             }
             .dataPointLabel{
               fill: #000000;
               text-anchor:middle;
               font-size: 10px;
               font-family: "Verdana", sans-serif;
               font-weight: normal;
             }
             .staggerGuideLine{
               fill: none;
               stroke: #000000;
               stroke-width: 0.5px;
             }
             #{get_css}
             .keyText{
               fill: #000000;
               text-anchor:start;
               font-size: #{key_font_size}px;
               font-family: "Verdana", sans-serif;
               font-weight: normal;
             }
             /* End copy for external style sheet */
             EOL
                   end
                 end
               end
             end

lib/redcloth.rb +1 -1

             #                                vim:ts=4:sw=4:
             # = RedCloth - Textile and Markdown Hybrid for Ruby
             #
             # Homepage::  http://whytheluckystiff.net/ruby/redcloth/
             # Author::    why the lucky stiff (http://whytheluckystiff.net/)
             # Copyright:: (cc) 2004 why the lucky stiff (and his puppet organizations.)
             # License::   BSD
             #
             # (see http://hobix.com/textile/ for a Textile Reference.)
             #
             # Based on (and also inspired by) both:
             #
             # PyTextile: http://diveintomark.org/projects/textile/textile.py.txt
             # Textism for PHP: http://www.textism.com/tools/textile/
             #
             #
             # = RedCloth
             #
             # RedCloth is a Ruby library for converting Textile and/or Markdown
             # into HTML.  You can use either format, intermingled or separately.
             # You can also extend RedCloth to honor your own custom text stylings.
             #
             # RedCloth users are encouraged to use Textile if they are generating
             # HTML and to use Markdown if others will be viewing the plain text.
             #
             # == What is Textile?
             #
             # Textile is a simple formatting style for text
             # documents, loosely based on some HTML conventions.
             #
             # == Sample Textile Text
             #
             #  h2. This is a title
             #
             #  h3. This is a subhead
             #
             #  This is a bit of paragraph.
             #
             #  bq. This is a blockquote.
             #
             # = Writing Textile
             #
             # A Textile document consists of paragraphs.  Paragraphs
             # can be specially formatted by adding a small instruction
             # to the beginning of the paragraph.
             #
             #  h[n].   Header of size [n].
             #  bq.     Blockquote.
             #  #       Numeric list.
             #  *       Bulleted list.
             #
             # == Quick Phrase Modifiers
             #
             # Quick phrase modifiers are also included, to allow formatting
             # of small portions of text within a paragraph.
             #
             #  \_emphasis\_
             #  \_\_italicized\_\_
             #  \*strong\*
             #  \*\*bold\*\*
             #  ??citation??
             #  -deleted text-
             #  +inserted text+
             #  ^superscript^
             #  ~subscript~
             #  @code@
             #  %(classname)span%
             #
             #  ==notextile== (leave text alone)
             #
             # == Links
             #
             # To make a hypertext link, put the link text in "quotation
             # marks" followed immediately by a colon and the URL of the link.
             #
             # Optional: text in (parentheses) following the link text,
             # but before the closing quotation mark, will become a Title
             # attribute for the link, visible as a tool tip when a cursor is above it.
             #
             # Example:
             #
             #  "This is a link (This is a title) ":http://www.textism.com
             #
             # Will become:
             #
             #  <a href="http://www.textism.com" title="This is a title">This is a link</a>
             #
             # == Images
             #
             # To insert an image, put the URL for the image inside exclamation marks.
             #
             # Optional: text that immediately follows the URL in (parentheses) will
             # be used as the Alt text for the image. Images on the web should always
             # have descriptive Alt text for the benefit of readers using non-graphical
             # browsers.
             #
             # Optional: place a colon followed by a URL immediately after the
             # closing ! to make the image into a link.
             #
             # Example:
             #
             #  !http://www.textism.com/common/textist.gif(Textist)!
             #
             # Will become:
             #
             #  <img src="http://www.textism.com/common/textist.gif" alt="Textist" />
             #
             # With a link:
             #
             #  !/common/textist.gif(Textist)!:http://textism.com
             #
             # Will become:
             #
             #  <a href="http://textism.com"><img src="/common/textist.gif" alt="Textist" /></a>
             #
             # == Defining Acronyms
             #
             # HTML allows authors to define acronyms via the tag. The definition appears as a
             # tool tip when a cursor hovers over the acronym. A crucial aid to clear writing,
             # this should be used at least once for each acronym in documents where they appear.
             #
             # To quickly define an acronym in Textile, place the full text in (parentheses)
             # immediately following the acronym.
             #
             # Example:
             #
             #  ACLU(American Civil Liberties Union)
             #
             # Will become:
             #
             #  <acronym title="American Civil Liberties Union">ACLU</acronym>
             #
             # == Adding Tables
             #
             # In Textile, simple tables can be added by seperating each column by
             # a pipe.
             #
             #     |a|simple|table|row|
             #     |And|Another|table|row|
             #
             # Attributes are defined by style definitions in parentheses.
             #
             #     table(border:1px solid black).
             #     (background:#ddd;color:red). |{}| | | |
             #
             # == Using RedCloth
             #
             # RedCloth is simply an extension of the String class, which can handle
             # Textile formatting.  Use it like a String and output HTML with its
             # RedCloth#to_html method.
             #
             #  doc = RedCloth.new "
             #
             #  h2. Test document
             #
             #  Just a simple test."
             #
             #  puts doc.to_html
             #
             # By default, RedCloth uses both Textile and Markdown formatting, with
             # Textile formatting taking precedence.  If you want to turn off Markdown
             # formatting, to boost speed and limit the processor:
             #
             #  class RedCloth::Textile.new( str )
             class RedCloth < String
                 VERSION = '3.0.4'
                 DEFAULT_RULES = [:textile, :markdown]
                 #
                 # Two accessor for setting security restrictions.
                 #
                 # This is a nice thing if you're using RedCloth for
                 # formatting in public places (e.g. Wikis) where you
                 # don't want users to abuse HTML for bad things.
                 #
                 # If +:filter_html+ is set, HTML which wasn't
                 # created by the Textile processor will be escaped.
                 #
                 # If +:filter_styles+ is set, it will also disable
                 # the style markup specifier. ('{color: red}')
                 #
                 attr_accessor :filter_html, :filter_styles
                 #
                 # Accessor for toggling hard breaks.
                 #
                 # If +:hard_breaks+ is set, single newlines will
                 # be converted to HTML break tags.  This is the
                 # default behavior for traditional RedCloth.
                 #
                 attr_accessor :hard_breaks
                 # Accessor for toggling lite mode.
                 #
                 # In lite mode, block-level rules are ignored.  This means
                 # that tables, paragraphs, lists, and such aren't available.
                 # Only the inline markup for bold, italics, entities and so on.
                 #
                 #   r = RedCloth.new( "And then? She *fell*!", [:lite_mode] )
                 #   r.to_html
                 #   #=> "And then? She <strong>fell</strong>!"
                 #
                 attr_accessor :lite_mode
                 #
                 # Accessor for toggling span caps.
                 #
                 # Textile places `span' tags around capitalized
                 # words by default, but this wreaks havoc on Wikis.
                 # If +:no_span_caps+ is set, this will be
                 # suppressed.
                 #
                 attr_accessor :no_span_caps
                 #
                 # Establishes the markup predence.  Available rules include:
                 #
                 # == Textile Rules
                 #
                 # The following textile rules can be set individually.  Or add the complete
                 # set of rules with the single :textile rule, which supplies the rule set in
                 # the following precedence:
                 #
                 # refs_textile::          Textile references (i.e. [hobix]http://hobix.com/)
                 # block_textile_table::   Textile table block structures
                 # block_textile_lists::   Textile list structures
                 # block_textile_prefix::  Textile blocks with prefixes (i.e. bq., h2., etc.)
                 # inline_textile_image::  Textile inline images
                 # inline_textile_link::   Textile inline links
                 # inline_textile_span::   Textile inline spans
                 # glyphs_textile:: Textile entities (such as em-dashes and smart quotes)
                 #
                 # == Markdown
                 #
                 # refs_markdown::         Markdown references (for example: [hobix]: http://hobix.com/)
                 # block_markdown_setext:: Markdown setext headers
                 # block_markdown_atx::    Markdown atx headers
                 # block_markdown_rule::   Markdown horizontal rules
                 # block_markdown_bq::     Markdown blockquotes
                 # block_markdown_lists::  Markdown lists
                 # inline_markdown_link::  Markdown links
                 attr_accessor :rules
                 # Returns a new RedCloth object, based on _string_ and
                 # enforcing all the included _restrictions_.
                 #
                 #   r = RedCloth.new( "h1. A <b>bold</b> man", [:filter_html] )
                 #   r.to_html
                 #     #=>"<h1>A &lt;b&gt;bold&lt;/b&gt; man</h1>"
                 #
                 def initialize( string, restrictions = [] )
                     restrictions.each { |r| method( "#{ r }=" ).call( true ) }
                     super( string )
                 end
                 #
                 # Generates HTML from the Textile contents.
                 #
                 #   r = RedCloth.new( "And then? She *fell*!" )
                 #   r.to_html( true )
                 #     #=>"And then? She <strong>fell</strong>!"
                 #
                 def to_html( *rules )
                     rules = DEFAULT_RULES if rules.empty?
                     # make our working copy
                     text = self.dup
                     @urlrefs = {}
                     @shelf = []
                     textile_rules = [:refs_textile, :block_textile_table, :block_textile_lists,
                                      :block_textile_prefix, :inline_textile_image, :inline_textile_link,
                                      :inline_textile_code, :inline_textile_span]
                     markdown_rules = [:refs_markdown, :block_markdown_setext, :block_markdown_atx, :block_markdown_rule,
                                       :block_markdown_bq, :block_markdown_lists,
                                       :inline_markdown_reflink, :inline_markdown_link]
                     @rules = rules.collect do |rule|
                         case rule
                         when :markdown
                             markdown_rules
                         when :textile
                             textile_rules
                         else
                             rule
                         end
                     end.flatten
                     # standard clean up
                     incoming_entities text
                     clean_white_space text
                     # start processor
                     @pre_list = []
                     rip_offtags text
                     no_textile text
                     escape_html_tags text
                     hard_break text
                     unless @lite_mode
                         refs text
                         blocks text
                     end
                     inline text
                     smooth_offtags text
                     retrieve text
                     text.gsub!( /<\/?notextile>/, '' )
                     text.gsub!( /x%x%/, '&#38;' )
                     clean_html text if filter_html
                     text.strip!
                     text
                 end
                 #######
                 private
                 #######
                 #
                 # Mapping of 8-bit ASCII codes to HTML numerical entity equivalents.
                 # (from PyTextile)
                 #
                 TEXTILE_TAGS =
                     [[128, 8364], [129, 0], [130, 8218], [131, 402], [132, 8222], [133, 8230],
                      [134, 8224], [135, 8225], [136, 710], [137, 8240], [138, 352], [139, 8249],
                      [140, 338], [141, 0], [142, 0], [143, 0], [144, 0], [145, 8216], [146, 8217],
                      [147, 8220], [148, 8221], [149, 8226], [150, 8211], [151, 8212], [152, 732],
                      [153, 8482], [154, 353], [155, 8250], [156, 339], [157, 0], [158, 0], [159, 376]].
                     collect! do |a, b|
                         [a.chr, ( b.zero? and "" or "&#{ b };" )]
                     end
                 #
                 # Regular expressions to convert to HTML.
                 #
                 A_HLGN = /(?:(?:<>|<|>|\=|[()]+)+)/
                 A_VLGN = /[\-^~]/
                 C_CLAS = '(?:\([^)]+\))'
                 C_LNGE = '(?:\[[^\]]+\])'
                 C_STYL = '(?:\{[^}]+\})'
                 S_CSPN = '(?:\\\\\d+)'
                 S_RSPN = '(?:/\d+)'
                 A = "(?:#{A_HLGN}?#{A_VLGN}?|#{A_VLGN}?#{A_HLGN}?)"
                 S = "(?:#{S_CSPN}?#{S_RSPN}|#{S_RSPN}?#{S_CSPN}?)"
                 C = "(?:#{C_CLAS}?#{C_STYL}?#{C_LNGE}?|#{C_STYL}?#{C_LNGE}?#{C_CLAS}?|#{C_LNGE}?#{C_STYL}?#{C_CLAS}?)"
                 # PUNCT = Regexp::quote( '!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~' )
                 PUNCT = Regexp::quote( '!"#$%&\'*+,-./:;=?@\\^_`|~' )
                 PUNCT_NOQ = Regexp::quote( '!"#$&\',./:;=?@\\`|' )
                 PUNCT_Q = Regexp::quote( '*-_+^~%' )
                 HYPERLINK = '(\S+?)([^\w\s/;=\?]*?)(?=\s|<|$)'
                 # Text markup tags, don't conflict with block tags
                 SIMPLE_HTML_TAGS = [
                     'tt', 'b', 'i', 'big', 'small', 'em', 'strong', 'dfn', 'code',
                     'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'a', 'img', 'br',
                     'br', 'map', 'q', 'sub', 'sup', 'span', 'bdo'
                 ]
                 QTAGS = [
                     ['**', 'b', :limit],
                     ['*', 'strong', :limit],
                     ['??', 'cite', :limit],
                     ['-', 'del', :limit],
                     ['__', 'i', :limit],
                     ['_', 'em', :limit],
                     ['%', 'span', :limit],
                     ['+', 'ins', :limit],
                     ['^', 'sup', :limit],
                     ['~', 'sub', :limit]
                 ]
                 QTAGS.collect! do |rc, ht, rtype|
                     rcq = Regexp::quote rc
                     re =
                         case rtype
                         when :limit
                             /(^|[>\s\(])
                             (#{rcq})
                             (#{C})
                             (?::(\S+?))?
                             ([^\s\-].*?[^\s\-]|\w)
                             #{rcq}
                             (?=[[:punct:]]|\s|\)|$)/x
                         else
                             /(#{rcq})
                             (#{C})
                             (?::(\S+))?
                             ([^\s\-].*?[^\s\-]|\w)
                             #{rcq}/xm
                         end
                     [rc, ht, re, rtype]
                 end
                 # Elements to handle
                 GLYPHS = [
                 #   [ /([^\s\[{(>])?\'([dmst]\b|ll\b|ve\b|\s|:|$)/, '\1&#8217;\2' ], # single closing
                 #   [ /([^\s\[{(>#{PUNCT_Q}][#{PUNCT_Q}]*)\'/, '\1&#8217;' ], # single closing
                 #   [ /\'(?=[#{PUNCT_Q}]*(s\b|[\s#{PUNCT_NOQ}]))/, '&#8217;' ], # single closing
                 #   [ /\'/, '&#8216;' ], # single opening
                     [ /</, '&lt;' ], # less-than
                     [ />/, '&gt;' ], # greater-than
                 #   [ /([^\s\[{(])?"(\s|:|$)/, '\1&#8221;\2' ], # double closing
                 #   [ /([^\s\[{(>#{PUNCT_Q}][#{PUNCT_Q}]*)"/, '\1&#8221;' ], # double closing
                 #   [ /"(?=[#{PUNCT_Q}]*[\s#{PUNCT_NOQ}])/, '&#8221;' ], # double closing
                 #   [ /"/, '&#8220;' ], # double opening
                     [ /\b( )?\.{3}/, '\1&#8230;' ], # ellipsis
                     [ /\b([A-Z][A-Z0-9]{2,})\b(?:[(]([^)]*)[)])/, '<acronym title="\2">\1</acronym>' ], # 3+ uppercase acronym
                     [ /(^|[^"][>\s])([A-Z][A-Z0-9 ]+[A-Z0-9])([^<A-Za-z0-9]|$)/, '\1<span class="caps">\2</span>\3', :no_span_caps ], # 3+ uppercase caps
                     [ /(\.\s)?\s?--\s?/, '\1&#8212;' ], # em dash
                     [ /\s->\s/, ' &rarr; ' ], # right arrow
                     [ /\s-\s/, ' &#8211; ' ], # en dash
                     [ /(\d+) ?x ?(\d+)/, '\1&#215;\2' ], # dimension sign
                     [ /\b ?[(\[]TM[\])]/i, '&#8482;' ], # trademark
                     [ /\b ?[(\[]R[\])]/i, '&#174;' ], # registered
                     [ /\b ?[(\[]C[\])]/i, '&#169;' ] # copyright
                 ]
                 H_ALGN_VALS = {
                     '<' => 'left',
                     '=' => 'center',
                     '>' => 'right',
                     '<>' => 'justify'
                 }
                 V_ALGN_VALS = {
                     '^' => 'top',
                     '-' => 'middle',
                     '~' => 'bottom'
                 }
                 #
                 # Flexible HTML escaping
                 #
                 def htmlesc( str, mode )
                     str.gsub!( '&', '&amp;' )
                     str.gsub!( '"', '&quot;' ) if mode != :NoQuotes
                     str.gsub!( "'", '&#039;' ) if mode == :Quotes
                     str.gsub!( '<', '&lt;')
                     str.gsub!( '>', '&gt;')
                 end
                 # Search and replace for Textile glyphs (quotes, dashes, other symbols)
                 def pgl( text )
                     GLYPHS.each do |re, resub, tog|
                         next if tog and method( tog ).call
                         text.gsub! re, resub
                     end
                 end
                 # Parses Textile attribute lists and builds an HTML attribute string
                 def pba( text_in, element = "" )
                     return '' unless text_in
                     style = []
                     text = text_in.dup
                     if element == 'td'
                         colspan = $1 if text =~ /\\(\d+)/
                         rowspan = $1 if text =~ /\/(\d+)/
                         style << "vertical-align:#{ v_align( $& ) };" if text =~ A_VLGN
                     end
                     style << "#{ $1 };" if not filter_styles and
                         text.sub!( /\{([^}]*)\}/, '' )
                     lang = $1 if
                         text.sub!( /\[([^)]+?)\]/, '' )
                     cls = $1 if
                         text.sub!( /\(([^()]+?)\)/, '' )
                     style << "padding-left:#{ $1.length }em;" if
                         text.sub!( /([(]+)/, '' )
                     style << "padding-right:#{ $1.length }em;" if text.sub!( /([)]+)/, '' )
                     style << "text-align:#{ h_align( $& ) };" if text =~ A_HLGN
                     cls, id = $1, $2 if cls =~ /^(.*?)#(.*)$/
                     atts = ''
                     atts << " style=\"#{ style.join }\"" unless style.empty?
                     atts << " class=\"#{ cls }\"" unless cls.to_s.empty?
                     atts << " lang=\"#{ lang }\"" if lang
                     atts << " id=\"#{ id }\"" if id
                     atts << " colspan=\"#{ colspan }\"" if colspan
                     atts << " rowspan=\"#{ rowspan }\"" if rowspan
                     atts
                 end
                 TABLE_RE = /^(?:table(_?#{S}#{A}#{C})\. ?\n)?^(#{A}#{C}\.? ?\|.*?\|)(\n\n|\Z)/m
                 # Parses a Textile table block, building HTML from the result.
                 def block_textile_table( text )
                     text.gsub!( TABLE_RE ) do |matches|
                         tatts, fullrow = $~[1..2]
                         tatts = pba( tatts, 'table' )
                         tatts = shelve( tatts ) if tatts
                         rows = []
                         fullrow.
                         split( /\|$/m ).
                         delete_if { |x| x.empty? }.
                         each do |row|
                             ratts, row = pba( $1, 'tr' ), $2 if row =~ /^(#{A}#{C}\. )(.*)/m
                             cells = []
                             #row.split( /\(?!\[\[[^\]])|(?![^\[]\]\])/ ).each do |cell|
                             row.split( /\|(?![^\[\|]*\]\])/ ).each do |cell|
                                 ctyp = 'd'
                                 ctyp = 'h' if cell =~ /^_/
                                 catts = ''
                                 catts, cell = pba( $1, 'td' ), $2 if cell =~ /^(_?#{S}#{A}#{C}\. ?)(.*)/
                                 unless cell.strip.empty?
                                     catts = shelve( catts ) if catts
                                     cells << "\t\t\t<t#{ ctyp }#{ catts }>#{ cell }</t#{ ctyp }>"
                                 end
                             end
                             ratts = shelve( ratts ) if ratts
                             rows << "\t\t<tr#{ ratts }>\n#{ cells.join( "\n" ) }\n\t\t</tr>"
                         end
                         "\t<table#{ tatts }>\n#{ rows.join( "\n" ) }\n\t</table>\n\n"
                     end
                 end
                 LISTS_RE = /^([#*]+?#{C} .*?)$(?![^#*])/m
                 LISTS_CONTENT_RE = /^([#*]+)(#{A}#{C}) (.*)$/m
                 # Parses Textile lists and generates HTML
                 def block_textile_lists( text )
                     text.gsub!( LISTS_RE ) do |match|
                         lines = match.split( /\n/ )
                         last_line = -1
                         depth = []
                         lines.each_with_index do |line, line_id|
                             if line =~ LISTS_CONTENT_RE
                                 tl,atts,content = $~[1..3]
                                 if depth.last
                                     if depth.last.length > tl.length
                                         (depth.length - 1).downto(0) do |i|
                                             break if depth[i].length == tl.length
                                             lines[line_id - 1] << "</li>\n\t</#{ lT( depth[i] ) }l>\n\t"
                                             depth.pop
                                         end
                                     end
                                     if depth.last and depth.last.length == tl.length
                                         lines[line_id - 1] << '</li>'
                                     end
                                 end
                                 unless depth.last == tl
                                     depth << tl
                                     atts = pba( atts )
                                     atts = shelve( atts ) if atts
                                     lines[line_id] = "\t<#{ lT(tl) }l#{ atts }>\n\t<li>#{ content }"
                                 else
                                     lines[line_id] = "\t\t<li>#{ content }"
                                 end
                                 last_line = line_id
                             else
                                 last_line = line_id
                             end
                             if line_id - last_line > 1 or line_id == lines.length - 1
                                 depth.delete_if do |v|
                                     lines[last_line] << "</li>\n\t</#{ lT( v ) }l>"
                                 end
                             end
                         end
                         lines.join( "\n" )
                     end
                 end
                 CODE_RE = /(\W)
                     @
                     (?:\|(\w+?)\|)?
                     (.+?)
                     @
                     (?=\W)/x
                 def inline_textile_code( text )
                     text.gsub!( CODE_RE ) do |m|
                         before,lang,code,after = $~[1..4]
                         lang = " lang=\"#{ lang }\"" if lang
                         rip_offtags( "#{ before }<code#{ lang }>#{ code }</code>#{ after }" )
                     end
                 end
                 def lT( text )
                     text =~ /\#$/ ? 'o' : 'u'
                 end
                 def hard_break( text )
                     text.gsub!( /(.)\n(?!\Z| *([#*=]+(\s|$)|[{|]))/, "\\1<br />" ) if hard_breaks
                 end
                 BLOCKS_GROUP_RE = /\n{2,}(?! )/m
                 def blocks( text, deep_code = false )
                     text.replace( text.split( BLOCKS_GROUP_RE ).collect do |blk|
                         plain = blk !~ /\A[#*> ]/
                         # skip blocks that are complex HTML
                         if blk =~ /^<\/?(\w+).*>/ and not SIMPLE_HTML_TAGS.include? $1
                             blk
                         else
                             # search for indentation levels
                             blk.strip!
                             if blk.empty?
                                 blk
                             else
                                 code_blk = nil
                                 blk.gsub!( /((?:\n(?:\n^ +[^\n]*)+)+)/m ) do |iblk|
                                     flush_left iblk
                                     blocks iblk, plain
                                     iblk.gsub( /^(\S)/, "\t\\1" )
                                     if plain
                                         code_blk = iblk; ""
                                     else
                                         iblk
                                     end
                                 end
                                 block_applied = 0
                                 @rules.each do |rule_name|
                                     block_applied += 1 if ( rule_name.to_s.match /^block_/ and method( rule_name ).call( blk ) )
                                 end
                                 if block_applied.zero?
                                     if deep_code
                                         blk = "\t<pre><code>#{ blk }</code></pre>"
                                     else
                                         blk = "\t<p>#{ blk }</p>"
                                     end
                                 end
                                 # hard_break blk
                                 blk + "\n#{ code_blk }"
                             end
                         end
                     end.join( "\n\n" ) )
                 end
                 def textile_bq( tag, atts, cite, content )
                     cite, cite_title = check_refs( cite )
                     cite = " cite=\"#{ cite }\"" if cite
                     atts = shelve( atts ) if atts
                     "\t<blockquote#{ cite }>\n\t\t<p#{ atts }>#{ content }</p>\n\t</blockquote>"
                 end
                 def textile_p( tag, atts, cite, content )
                     atts = shelve( atts ) if atts
                     "\t<#{ tag }#{ atts }>#{ content }</#{ tag }>"
                 end
                 alias textile_h1 textile_p
                 alias textile_h2 textile_p
                 alias textile_h3 textile_p
                 alias textile_h4 textile_p
                 alias textile_h5 textile_p
                 alias textile_h6 textile_p
                 def textile_fn_( tag, num, atts, cite, content )
                     atts << " id=\"fn#{ num }\""
                     content = "<sup>#{ num }</sup> #{ content }"
                     atts = shelve( atts ) if atts
                     "\t<p#{ atts }>#{ content }</p>"
                 end
                 BLOCK_RE = /^(([a-z]+)(\d*))(#{A}#{C})\.(?::(\S+))? (.*)$/m
                 def block_textile_prefix( text )
                     if text =~ BLOCK_RE
                         tag,tagpre,num,atts,cite,content = $~[1..6]
                         atts = pba( atts )
                         # pass to prefix handler
                         if respond_to? "textile_#{ tag }", true
                             text.gsub!( $&, method( "textile_#{ tag }" ).call( tag, atts, cite, content ) )
                         elsif respond_to? "textile_#{ tagpre }_", true
                             text.gsub!( $&, method( "textile_#{ tagpre }_" ).call( tagpre, num, atts, cite, content ) )
                         end
                     end
                 end
                 SETEXT_RE = /\A(.+?)\n([=-])[=-]* *$/m
                 def block_markdown_setext( text )
                     if text =~ SETEXT_RE
                         tag = if $2 == "="; "h1"; else; "h2"; end
                         blk, cont = "<#{ tag }>#{ $1 }</#{ tag }>", $'
                         blocks cont
                         text.replace( blk + cont )
                     end
                 end
                 ATX_RE = /\A(\#{1,6})  # $1 = string of #'s
                           [ ]*
                           (.+?)       # $2 = Header text
                           [ ]*
                           \#*         # optional closing #'s (not counted)
                           $/x
                 def block_markdown_atx( text )
                     if text =~ ATX_RE
                         tag = "h#{ $1.length }"
                         blk, cont = "<#{ tag }>#{ $2 }</#{ tag }>\n\n", $'
                         blocks cont
                         text.replace( blk + cont )
                     end
                 end
                 MARKDOWN_BQ_RE = /\A(^ *> ?.+$(.+\n)*\n*)+/m
                 def block_markdown_bq( text )
                     text.gsub!( MARKDOWN_BQ_RE ) do |blk|
                         blk.gsub!( /^ *> ?/, '' )
                         flush_left blk
                         blocks blk
                         blk.gsub!( /^(\S)/, "\t\\1" )
                         "<blockquote>\n#{ blk }\n</blockquote>\n\n"
                     end
                 end
                 MARKDOWN_RULE_RE = /^(#{
                     ['*', '-', '_'].collect { |ch| '( ?' + Regexp::quote( ch ) + ' ?){3,}' }.join( '|' )
                 })$/
                 def block_markdown_rule( text )
                     text.gsub!( MARKDOWN_RULE_RE ) do |blk|
                         "<hr />"
                     end
                 end
                 # XXX TODO XXX
                 def block_markdown_lists( text )
                 end
                 def inline_textile_span( text )
                     QTAGS.each do |qtag_rc, ht, qtag_re, rtype|
                         text.gsub!( qtag_re ) do |m|
                             case rtype
                             when :limit
                                 sta,qtag,atts,cite,content = $~[1..5]
                             else
                                 qtag,atts,cite,content = $~[1..4]
                                 sta = ''
                             end
                             atts = pba( atts )
                             atts << " cite=\"#{ cite }\"" if cite
                             atts = shelve( atts ) if atts
                             "#{ sta }<#{ ht }#{ atts }>#{ content }</#{ ht }>"
                         end
                     end
                 end
                 LINK_RE = /
                         ([\s\[{(]|[#{PUNCT}])?     # $pre
                         "                          # start
                         (#{C})                     # $atts
                         ([^"\n]+?)                 # $text
                         \s?
                         (?:\(([^)]+?)\)(?="))?     # $title
                         ":
                         (\S+?)                     # $url
                         (\/)?                      # $slash
                         ([^\w\/;]*?)               # $post
                         (?=<|\s|$)
                     /x
                 def inline_textile_link( text )
                     text.gsub!( LINK_RE ) do |m|
                         pre,atts,text,title,url,slash,post = $~[1..7]
                         url, url_title = check_refs( url )
                         title ||= url_title
                         atts = pba( atts )
                         atts = " href=\"#{ url }#{ slash }\"#{ atts }"
                         atts << " title=\"#{ title }\"" if title
                         atts = shelve( atts ) if atts
                         external = (url =~ /^https?:\/\//) ? ' class="external"' : ''
                         "#{ pre }<a#{ atts }#{ external }>#{ text }</a>#{ post }"
                     end
                 end
                 MARKDOWN_REFLINK_RE = /
                         \[([^\[\]]+)\]      # $text
                         [ ]?                # opt. space
                         (?:\n[ ]*)?         # one optional newline followed by spaces
                         \[(.*?)\]           # $id
                     /x
                 def inline_markdown_reflink( text )
                     text.gsub!( MARKDOWN_REFLINK_RE ) do |m|
                         text, id = $~[1..2]
                         if id.empty?
                             url, title = check_refs( text )
                         else
                             url, title = check_refs( id )
                         end
                         atts = " href=\"#{ url }\""
                         atts << " title=\"#{ title }\"" if title
                         atts = shelve( atts )
                         "<a#{ atts }>#{ text }</a>"
                     end
                 end
                 MARKDOWN_LINK_RE = /
                         \[([^\[\]]+)\]      # $text
                         \(                  # open paren
                         [ \t]*              # opt space
                         <?(.+?)>?           # $href
                         [ \t]*              # opt space
                         (?:                 # whole title
                         (['"])              # $quote
                         (.*?)               # $title
                         \3                  # matching quote
                         )?                  # title is optional
                         \)
                     /x
                 def inline_markdown_link( text )
                     text.gsub!( MARKDOWN_LINK_RE ) do |m|
                         text, url, quote, title = $~[1..4]
                         atts = " href=\"#{ url }\""
                         atts << " title=\"#{ title }\"" if title
                         atts = shelve( atts )
                         "<a#{ atts }>#{ text }</a>"
                     end
                 end
                 TEXTILE_REFS_RE =  /(^ *)\[([^\[\n]+?)\](#{HYPERLINK})(?=\s|$)/
                 MARKDOWN_REFS_RE = /(^ *)\[([^\n]+?)\]:\s+<?(#{HYPERLINK})>?(?:\s+"((?:[^"]|\\")+)")?(?=\s|$)/m
                 def refs( text )
                     @rules.each do |rule_name|
                         method( rule_name ).call( text ) if rule_name.to_s.match /^refs_/
                     end
                 end
                 def refs_textile( text )
                     text.gsub!( TEXTILE_REFS_RE ) do |m|
                         flag, url = $~[2..3]
                         @urlrefs[flag.downcase] = [url, nil]
                         nil
                     end
                 end
                 def refs_markdown( text )
                     text.gsub!( MARKDOWN_REFS_RE ) do |m|
                         flag, url = $~[2..3]
                         title = $~[6]
                         @urlrefs[flag.downcase] = [url, title]
                         nil
                     end
                 end
                 def check_refs( text )
                     ret = @urlrefs[text.downcase] if text
                     ret || [text, nil]
                 end
                 IMAGE_RE = /
                         (<p>|.|^)            # start of line?
                         \!                   # opening
                         (\<|\=|\>)?          # optional alignment atts
                         (#{C})               # optional style,class atts
                         (?:\. )?             # optional dot-space
                         ([^\s(!]+?)          # presume this is the src
                         \s?                  # optional space
                         (?:\(((?:[^\(\)]|\([^\)]+\))+?)\))?   # optional title
                         \!                   # closing
                         (?::#{ HYPERLINK })? # optional href
                     /x
                 def inline_textile_image( text )
                     text.gsub!( IMAGE_RE )  do |m|
                         stln,algn,atts,url,title,href,href_a1,href_a2 = $~[1..8]
                         atts = pba( atts )
                         atts = " src=\"#{ url }\"#{ atts }"
                         atts << " title=\"#{ title }\"" if title
                         atts << " alt=\"#{ title }\""
                         # size = @getimagesize($url);
                         # if($size) $atts.= " $size[3]";
                         href, alt_title = check_refs( href ) if href
                         url, url_title = check_refs( url )
                         out = ''
                         out << "<a#{ shelve( " href=\"#{ href }\"" ) }>" if href
                         out << "<img#{ shelve( atts ) } />"
                         out << "</a>#{ href_a1 }#{ href_a2 }" if href
                         if algn
                             algn = h_align( algn )
                             if stln == "<p>"
                                 out = "<p style=\"float:#{ algn }\">#{ out }"
                             else
                                 out = "#{ stln }<div style=\"float:#{ algn }\">#{ out }</div>"
                             end
                         else
                             out = stln + out
                         end
                         out
                     end
                 end
                 def shelve( val )
                     @shelf << val
                     " :redsh##{ @shelf.length }:"
                 end
                 def retrieve( text )
                     @shelf.each_with_index do |r, i|
                         text.gsub!( " :redsh##{ i + 1 }:", r )
                     end
                 end
                 def incoming_entities( text )
                     ## turn any incoming ampersands into a dummy character for now.
                     ## This uses a negative lookahead for alphanumerics followed by a semicolon,
                     ## implying an incoming html entity, to be skipped
                     text.gsub!( /&(?![#a-z0-9]+;)/i, "x%x%" )
                 end
                 def no_textile( text )
                     text.gsub!( /(^|\s)==([^=]+.*?)==(\s|$)?/,
                         '\1<notextile>\2</notextile>\3' )
                     text.gsub!( /^ *==([^=]+.*?)==/m,
                         '\1<notextile>\2</notextile>\3' )
                 end
                 def clean_white_space( text )
                     # normalize line breaks
                     text.gsub!( /\r\n/, "\n" )
                     text.gsub!( /\r/, "\n" )
                     text.gsub!( /\t/, '    ' )
                     text.gsub!( /^ +$/, '' )
                     text.gsub!( /\n{3,}/, "\n\n" )
                     text.gsub!( /"$/, "\" " )
                     # if entire document is indented, flush
                     # to the left side
                     flush_left text
                 end
                 def flush_left( text )
                     indt = 0
                     if text =~ /^ /
                         while text !~ /^ {#{indt}}\S/
                             indt += 1
                         end unless text.empty?
                         if indt.nonzero?
                             text.gsub!( /^ {#{indt}}/, '' )
                         end
                     end
                 end
                 def footnote_ref( text )
                     text.gsub!( /\b\[([0-9]+?)\](\s)?/,
                         '<sup><a href="#fn\1">\1</a></sup>\2' )
                 end
                 OFFTAGS = /(code|pre|kbd|notextile)/
                 OFFTAG_MATCH = /(?:(<\/#{ OFFTAGS }>)|(<#{ OFFTAGS }[^>]*>))(.*?)(?=<\/?#{ OFFTAGS }|\Z)/mi
                 OFFTAG_OPEN = /<#{ OFFTAGS }/
                 OFFTAG_CLOSE = /<\/?#{ OFFTAGS }/
                 HASTAG_MATCH = /(<\/?\w[^\n]*?>)/m
                 ALLTAG_MATCH = /(<\/?\w[^\n]*?>)|.*?(?=<\/?\w[^\n]*?>|$)/m
                 def glyphs_textile( text, level = 0 )
                     if text !~ HASTAG_MATCH
                         pgl text
                         footnote_ref text
                     else
                         codepre = 0
                         text.gsub!( ALLTAG_MATCH ) do |line|
                             ## matches are off if we're between <code>, <pre> etc.
                             if $1
                                 if line =~ OFFTAG_OPEN
                                     codepre += 1
                                 elsif line =~ OFFTAG_CLOSE
                                     codepre -= 1
                                     codepre = 0 if codepre < 0
                                 end
                             elsif codepre.zero?
                                 glyphs_textile( line, level + 1 )
                             else
                                 htmlesc( line, :NoQuotes )
                             end
                             # p [level, codepre, line]
                             line
                         end
                     end
                 end
                 def rip_offtags( text )
                     if text =~ /<.*>/
                         ## strip and encode <pre> content
                         codepre, used_offtags = 0, {}
                         text.gsub!( OFFTAG_MATCH ) do |line|
                             if $3
                                 offtag, aftertag = $4, $5
                                 codepre += 1
                                 used_offtags[offtag] = true
                                 if codepre - used_offtags.length > 0
                                     htmlesc( line, :NoQuotes ) unless used_offtags['notextile']
                                     @pre_list.last << line
                                     line = ""
                                 else
                                     htmlesc( aftertag, :NoQuotes ) if aftertag and not used_offtags['notextile']
                                     line = "<redpre##{ @pre_list.length }>"
                                     @pre_list << "#{ $3 }#{ aftertag }"
                                 end
                             elsif $1 and codepre > 0
                                 if codepre - used_offtags.length > 0
                                     htmlesc( line, :NoQuotes ) unless used_offtags['notextile']
                                     @pre_list.last << line
                                     line = ""
                                 end
                                 codepre -= 1 unless codepre.zero?
                                 used_offtags = {} if codepre.zero?
                             end
                             line
                         end
                     end
                     text
                 end
                 def smooth_offtags( text )
                     unless @pre_list.empty?
                         ## replace <pre> content
                         text.gsub!( /<redpre#(\d+)>/ ) { @pre_list[$1.to_i] }
                     end
                 end
                 def inline( text )
                     [/^inline_/, /^glyphs_/].each do |meth_re|
                         @rules.each do |rule_name|
                             method( rule_name ).call( text ) if rule_name.to_s.match( meth_re )
                         end
                     end
                 end
                 def h_align( text )
                     H_ALGN_VALS[text]
                 end
                 def v_align( text )
                     V_ALGN_VALS[text]
                 end
                 def textile_popup_help( name, windowW, windowH )
                     ' <a target="_blank" href="http://hobix.com/textile/#' + helpvar + '" onclick="window.open(this.href, \'popupwindow\', \'width=' + windowW + ',height=' + windowH + ',scrollbars,resizable\'); return false;">' + name + '</a><br />'
                 end
                 # HTML cleansing stuff
                 BASIC_TAGS = {
                     'a' => ['href', 'title'],
                     'img' => ['src', 'alt', 'title'],
                     'br' => [],
                     'i' => nil,
                     'u' => nil,
                     'b' => nil,
                     'pre' => nil,
                     'kbd' => nil,
                     'code' => ['lang'],
                     'cite' => nil,
                     'strong' => nil,
                     'em' => nil,
                     'ins' => nil,
                     'sup' => nil,
                     'sub' => nil,
                     'del' => nil,
                     'table' => nil,
                     'tr' => nil,
                     'td' => ['colspan', 'rowspan'],
                     'th' => nil,
                     'ol' => nil,
                     'ul' => nil,
                     'li' => nil,
                     'p' => nil,
                     'h1' => nil,
                     'h2' => nil,
                     'h3' => nil,
                     'h4' => nil,
                     'h5' => nil,
                     'h6' => nil,
                     'blockquote' => ['cite']
                 }
                 def clean_html( text, tags = BASIC_TAGS )
                     text.gsub!( /<!\[CDATA\[/, '' )
                     text.gsub!( /<(\/*)(\w+)([^>]*)>/ ) do
                         raw = $~
                         tag = raw[2].downcase
                         if tags.has_key? tag
                             pcs = [tag]
                             tags[tag].each do |prop|
                                 ['"', "'", ''].each do |q|
                                     q2 = ( q != '' ? q : '\s' )
                                     if raw[3] =~ /#{prop}\s*=\s*#{q}([^#{q2}]+)#{q}/i
                                         attrv = $1
                                         next if prop == 'src' and attrv =~ %r{^(?!http)\w+:}
                                         pcs << "#{prop}=\"#{$1.gsub('"', '\\"')}\""
                                         break
                                     end
                                 end
                             end if tags[tag]
                             "<#{raw[1]}#{pcs.join " "}>"
                         else
                             " "
                         end
                     end
                 end
-                ALLOWED_TAGS = %w(redpre pre code)
+                ALLOWED_TAGS = %w(redpre pre code notextile)
                 def escape_html_tags(text)
                   text.gsub!(%r{<(\/?([!\w]+)[^<>\n]*)(>?)}) {|m| ALLOWED_TAGS.include?($2) ? "<#{$1}#{$3}" : "&lt;#{$1}#{'&gt;' unless $3.blank?}" }
                 end
             end

public/stylesheets/application.css +1 -1

             body { font-family: Verdana, sans-serif; font-size: 12px; color:#484848; margin: 0; padding: 0; min-width: 900px; }
             h1, h2, h3, h4 { font-family: "Trebuchet MS", Verdana, sans-serif;}
             h1 {margin:0; padding:0; font-size: 24px;}
             h2, .wiki h1 {font-size: 20px;padding: 2px 10px 1px 0px;margin: 0 0 10px 0; border-bottom: 1px solid #bbbbbb; color: #444;}
             h3, .wiki h2 {font-size: 16px;padding: 2px 10px 1px 0px;margin: 0 0 10px 0; border-bottom: 1px solid #bbbbbb; color: #444;}
             h4, .wiki h3 {font-size: 13px;padding: 2px 10px 1px 0px;margin-bottom: 5px; border-bottom: 1px dotted #bbbbbb; color: #444;}
             /***** Layout *****/
             #wrapper {background: white;}
             #top-menu {background: #2C4056; color: #fff; height:1.8em; font-size: 0.8em; padding: 2px 2px 0px 6px;}
             #top-menu ul {margin: 0;  padding: 0;}
             #top-menu li {
               float:left;
               list-style-type:none;
               margin: 0px 0px 0px 0px;
               padding: 0px 0px 0px 0px;
               white-space:nowrap;
             }
             #top-menu a {color: #fff; padding-right: 8px; font-weight: bold;}
             #top-menu #loggedas { float: right; margin-right: 0.5em; color: #fff; }
             #account {float:right;}
             #header {height:5.3em;margin:0;background-color:#507AAA;color:#f8f8f8; padding: 4px 8px 0px 6px; position:relative;}
             #header a {color:#f8f8f8;}
             #quick-search {float:right;}
             #main-menu {position: absolute;  bottom: 0px;  left:6px; margin-right: -500px;}
             #main-menu ul {margin: 0;  padding: 0;}
             #main-menu li {
               float:left;
               list-style-type:none;
               margin: 0px 2px 0px 0px;
               padding: 0px 0px 0px 0px;
               white-space:nowrap;
             }
             #main-menu li a {
               display: block;
               color: #fff;
               text-decoration: none;
               font-weight: bold;
               margin: 0;
               padding: 4px 10px 4px 10px;
             }
             #main-menu li a:hover {background:#759FCF; color:#fff;}
             #main-menu li a.selected, #main-menu li a.selected:hover {background:#fff; color:#555;}
             #main {background-color:#EEEEEE;}
             #sidebar{ float: right; width: 17%; position: relative; z-index: 9; min-height: 600px; padding: 0; margin: 0;}
             * html #sidebar{ width: 17%; }
             #sidebar h3{ font-size: 14px; margin-top:14px; color: #666;  }
             #sidebar hr{ width: 100%; margin: 0 auto; height: 1px; background: #ccc; border: 0; }
             * html #sidebar hr{ width: 95%; position: relative; left: -6px; color: #ccc; }
             #content { width: 80%; background-color: #fff; margin: 0px; border-right: 1px solid #ddd; padding: 6px 10px 10px 10px; z-index: 10; height:600px; min-height: 600px;}
             * html #content{ width: 80%; padding-left: 0; margin-top: 0px; padding: 6px 10px 10px 10px;}
             html>body #content { height: auto; min-height: 600px; overflow: auto; }
             #main.nosidebar #sidebar{ display: none; }
             #main.nosidebar #content{ width: auto; border-right: 0; }
             #footer {clear: both; border-top: 1px solid #bbb; font-size: 0.9em; color: #aaa; padding: 5px; text-align:center; background:#fff;}
             #login-form table {margin-top:5em; padding:1em; margin-left: auto; margin-right: auto; border: 2px solid #FDBF3B; background-color:#FFEBC1; }
             #login-form table td {padding: 6px;}
             #login-form label {font-weight: bold;}
             .clear:after{ content: "."; display: block; height: 0; clear: both; visibility: hidden; }
             /***** Links *****/
             a, a:link, a:visited{ color: #2A5685; text-decoration: none; }
             a:hover, a:active{ color: #c61a1a; text-decoration: underline;}
             a img{ border: 0; }
             a.issue.closed, .issue.closed a { text-decoration: line-through; }
             /***** Tables *****/
             table.list { border: 1px solid #e4e4e4;  border-collapse: collapse; width: 100%; margin-bottom: 4px; }
             table.list th {  background-color:#EEEEEE; padding: 4px; white-space:nowrap; }
             table.list td { vertical-align: top; }
             table.list td.id { width: 2%; text-align: center;}
             table.list td.checkbox { width: 15px; padding: 0px;}
             table.list.issues { margin-top: 10px; }
             tr.issue { text-align: center; white-space: nowrap; }
             tr.issue td.subject, tr.issue td.category { white-space: normal; }
             tr.issue td.subject { text-align: left; }
             tr.issue td.done_ratio table.progress { margin-left:auto; margin-right: auto;}
             tr.entry { border: 1px solid #f8f8f8; }
             tr.entry td { white-space: nowrap; }
             tr.entry td.filename { width: 30%; }
             tr.entry td.size { text-align: right; font-size: 90%; }
             tr.entry td.revision, tr.entry td.author { text-align: center; }
             tr.entry td.age { text-align: right; }
             tr.changeset td.author { text-align: center; width: 15%; }
             tr.changeset td.committed_on { text-align: center; width: 15%; }
             tr.message { height: 2.6em; }
             tr.message td.last_message { font-size: 80%; }
             tr.message.locked td.subject a { background-image: url(../images/locked.png); }
             tr.message.sticky td.subject a { background-image: url(../images/sticky.png); font-weight: bold; }
             tr.user td { width:13%; }
             tr.user td.email { width:18%; }
             tr.user td { white-space: nowrap; }
             tr.user.locked, tr.user.registered { color: #aaa; }
             tr.user.locked a, tr.user.registered a { color: #aaa; }
             tr.time-entry { text-align: center; white-space: nowrap; }
             tr.time-entry td.subject, tr.time-entry td.comments { text-align: left; white-space: normal; }
             td.hours { text-align: right; font-weight: bold; padding-right: 0.5em; }
             td.hours .hours-dec { font-size: 0.9em; }
             table.list tbody tr:hover { background-color:#ffffdd; }
             table td {padding:2px;}
             table p {margin:0;}
             .odd {background-color:#f6f7f8;}
             .even {background-color: #fff;}
             .highlight { background-color: #FCFD8D;}
             .highlight.token-1 { background-color: #faa;}
             .highlight.token-2 { background-color: #afa;}
             .highlight.token-3 { background-color: #aaf;}
             .box{
             padding:6px;
             margin-bottom: 10px;
             background-color:#f6f6f6;
             color:#505050;
             line-height:1.5em;
             border: 1px solid #e4e4e4;
             }
             div.square {
              border: 1px solid #999;
              float: left;
              margin: .3em .4em 0 .4em;
              overflow: hidden;
              width: .6em; height: .6em;
             }
             .contextual {float:right; white-space: nowrap; line-height:1.4em;margin-top:5px; padding-left: 10px; font-size:0.9em;}
             .contextual input {font-size:0.9em;}
             .splitcontentleft{float:left; width:49%;}
             .splitcontentright{float:right; width:49%;}
             form {display: inline;}
             input, select {vertical-align: middle; margin-top: 1px; margin-bottom: 1px;}
             fieldset {border: 1px solid #e4e4e4; margin:0;}
             legend {color: #484848;}
             hr { width: 100%; height: 1px; background: #ccc; border: 0;}
             textarea.wiki-edit { width: 99%; }
             li p {margin-top: 0;}
             div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
             p.breadcrumb { font-size: 0.9em; margin: 4px 0 4px 0;}
             p.subtitle { font-size: 0.9em; margin: -6px 0 12px 0; font-style: italic; }
             fieldset#filters { padding: 0.7em; }
             fieldset#filters p { margin: 1.2em 0 0.8em 2px; }
             fieldset#filters .buttons { font-size: 0.9em; }
             fieldset#filters table { border-collapse: collapse; }
             fieldset#filters table td { padding: 0; vertical-align: middle; }
             fieldset#filters tr.filter { height: 2em; }
             fieldset#filters td.add-filter { text-align: right; vertical-align: top; }
             div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;}
             div#issue-changesets .changeset { padding: 4px;}
             div#issue-changesets .changeset { border-bottom: 1px solid #ddd; }
             div#issue-changesets p { margin-top: 0; margin-bottom: 1em;}
             div#activity dl { margin-left: 2em; }
             div#activity dd { margin-bottom: 1em; padding-left: 18px; }
             div#activity dt { margin-bottom: 1px; padding-left: 20px; line-height: 18px; background-position: 0 50%; background-repeat: no-repeat; }
             div#activity dt .time { color: #777; font-size: 80%; }
             div#activity dd .description { font-style: italic; }
             div#activity span.project:after { content: " -"; }
             div#activity dt.issue { background-image: url(../images/ticket.png); }
             div#activity dt.issue-edit { background-image: url(../images/ticket_edit.png); }
             div#activity dt.issue-closed { background-image: url(../images/ticket_checked.png); }
             div#activity dt.changeset { background-image: url(../images/changeset.png); }
             div#activity dt.news { background-image: url(../images/news.png); }
             div#activity dt.message { background-image: url(../images/message.png); }
             div#activity dt.reply { background-image: url(../images/comments.png); }
             div#activity dt.wiki-page { background-image: url(../images/wiki_edit.png); }
             div#activity dt.attachment { background-image: url(../images/attachment.png); }
             div#activity dt.document { background-image: url(../images/document.png); }
             div#roadmap fieldset.related-issues { margin-bottom: 1em; }
             div#roadmap fieldset.related-issues ul { margin-top: 0.3em; margin-bottom: 0.3em; }
             div#roadmap .wiki h1:first-child { display: none; }
             div#roadmap .wiki h1 { font-size: 120%; }
             div#roadmap .wiki h2 { font-size: 110%; }
             div#version-summary { float:right; width:380px; margin-left: 16px; margin-bottom: 16px; background-color: #fff; }
             div#version-summary fieldset { margin-bottom: 1em; }
             div#version-summary .total-hours { text-align: right; }
             table#time-report td.hours, table#time-report th.period, table#time-report th.total { text-align: right; padding-right: 0.5em; }
             table#time-report tbody tr { font-style: italic; color: #777; }
             table#time-report tbody tr.last-level { font-style: normal; color: #555; }
             table#time-report tbody tr.total { font-style: normal; font-weight: bold; color: #555; background-color:#EEEEEE; }
             table#time-report .hours-dec { font-size: 0.9em; }
             .total-hours { font-size: 110%; font-weight: bold; }
             .total-hours span.hours-int { font-size: 120%; }
             .autoscroll {overflow-x: auto; padding:1px; margin-bottom: 1.2em;}
             #user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; }
             .pagination {font-size: 90%}
             p.pagination {margin-top:8px;}
             /***** Tabular forms ******/
             .tabular p{
             margin: 0;
             padding: 5px 0 8px 0;
             padding-left: 180px; /*width of left column containing the label elements*/
             height: 1%;
             clear:left;
             }
-            html>body .tabular p {overflow:auto;}
+            html>body .tabular p {overflow:hidden;}
             .tabular label{
             font-weight: bold;
             float: left;
             text-align: right;
             margin-left: -180px; /*width of left column*/
             width: 175px; /*width of labels. Should be smaller than left column to create some right
             margin*/
             }
             .tabular label.floating{
             font-weight: normal;
             margin-left: 0px;
             text-align: left;
             width: 200px;
             }
             input#time_entry_comments { width: 90%;}
             #preview fieldset {margin-top: 1em; background: url(../images/draft.png)}
             .tabular.settings p{ padding-left: 300px; }
             .tabular.settings label{ margin-left: -300px; width: 295px; }
             .required {color: #bb0000;}
             .summary {font-style: italic;}
             #attachments_fields input[type=text] {margin-left: 8px; }
             div.attachments p { margin:4px 0 2px 0; }
             div.attachments img { vertical-align: middle; }
             div.attachments span.author { font-size: 0.9em; color: #888; }
             p.other-formats { text-align: right; font-size:0.9em; color: #666; }
             .other-formats span + span:before { content: "| "; }
             a.feed { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px 3px 16px; }
             /***** Flash & error messages ****/
             #errorExplanation, div.flash, .nodata, .warning {
                 padding: 4px 4px 4px 30px;
                 margin-bottom: 12px;
             	font-size: 1.1em;
             	border: 2px solid;
             }
             div.flash {margin-top: 8px;}
             div.flash.error, #errorExplanation {
                 background: url(../images/false.png) 8px 5px no-repeat;
             	background-color: #ffe3e3;
             	border-color: #dd0000;
             	color: #550000;
             }
             div.flash.notice {
                 background: url(../images/true.png) 8px 5px no-repeat;
             	background-color: #dfffdf;
             	border-color: #9fcf9f;
             	color: #005f00;
             }
             .nodata, .warning {
                 text-align: center;
             	background-color: #FFEBC1;
             	border-color: #FDBF3B;
             	color: #A6750C;
             }
             #errorExplanation ul { font-size: 0.9em;}
             /***** Ajax indicator ******/
             #ajax-indicator {
             position: absolute; /* fixed not supported by IE */
             background-color:#eee;
             border: 1px solid #bbb;
             top:35%;
             left:40%;
             width:20%;
             font-weight:bold;
             text-align:center;
             padding:0.6em;
             z-index:100;
             filter:alpha(opacity=50);
             opacity: 0.5;
             }
             html>body #ajax-indicator { position: fixed; }
             #ajax-indicator span {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             background-image: url(../images/loading.gif);
             padding-left: 26px;
             vertical-align: bottom;
             }
             /***** Calendar *****/
             table.cal {border-collapse: collapse; width: 100%; margin: 8px 0 6px 0;border: 1px solid #d7d7d7;}
             table.cal thead th {width: 14%;}
             table.cal tbody tr {height: 100px;}
             table.cal th { background-color:#EEEEEE; padding: 4px; }
             table.cal td {border: 1px solid #d7d7d7; vertical-align: top; font-size: 0.9em;}
             table.cal td p.day-num {font-size: 1.1em; text-align:right;}
             table.cal td.odd p.day-num {color: #bbb;}
             table.cal td.today {background:#ffffdd;}
             table.cal td.today p.day-num {font-weight: bold;}
             /***** Tooltips ******/
             .tooltip{position:relative;z-index:24;}
             .tooltip:hover{z-index:25;color:#000;}
             .tooltip span.tip{display: none; text-align:left;}
             div.tooltip:hover span.tip{
             display:block;
             position:absolute;
             top:12px; left:24px; width:270px;
             border:1px solid #555;
             background-color:#fff;
             padding: 4px;
             font-size: 0.8em;
             color:#505050;
             }
             /***** Progress bar *****/
             table.progress {
                 border: 1px solid #D7D7D7;
                 border-collapse: collapse;
                 border-spacing: 0pt;
                 empty-cells: show;
                 text-align: center;
                 float:left;
                 margin: 1px 6px 1px 0px;
             }
             table.progress td { height: 0.9em; }
             table.progress td.closed { background: #BAE0BA none repeat scroll 0%; }
             table.progress td.done { background: #DEF0DE none repeat scroll 0%; }
             table.progress td.open { background: #FFF none repeat scroll 0%; }
             p.pourcent {font-size: 80%;}
             p.progress-info {clear: left; font-style: italic; font-size: 80%;}
             /***** Tabs *****/
             #content .tabs {height: 2.6em; border-bottom: 1px solid #bbbbbb; margin-bottom:1.2em; position:relative;}
             #content .tabs ul {margin:0; position:absolute; bottom:-2px; padding-left:1em;}
             #content .tabs>ul { bottom:-1px; } /* others */
             #content .tabs ul li {
             float:left;
             list-style-type:none;
             white-space:nowrap;
             margin-right:8px;
             background:#fff;
             }
             #content .tabs ul li a{
             display:block;
             font-size: 0.9em;
             text-decoration:none;
             line-height:1.3em;
             padding:4px 6px 4px 6px;
             border: 1px solid #ccc;
             border-bottom: 1px solid #bbbbbb;
             background-color: #eeeeee;
             color:#777;
             font-weight:bold;
             }
             #content .tabs ul li a:hover {
             background-color: #ffffdd;
             text-decoration:none;
             }
             #content .tabs ul li a.selected {
             background-color: #fff;
             border: 1px solid #bbbbbb;
             border-bottom: 1px solid #fff;
             }
             #content .tabs ul li a.selected:hover {
             background-color: #fff;
             }
             /***** Diff *****/
             .diff_out { background: #fcc; }
             .diff_in { background: #cfc; }
             /***** Wiki *****/
             div.wiki table {
                 border: 1px solid #505050;
                 border-collapse: collapse;
                 margin-bottom: 1em;
             }
             div.wiki table, div.wiki td, div.wiki th {
                 border: 1px solid #bbb;
                 padding: 4px;
             }
             div.wiki .external {
                 background-position: 0% 60%;
                 background-repeat: no-repeat;
                 padding-left: 12px;
                 background-image: url(../images/external.png);
             }
             div.wiki a.new {
                 color: #b73535;
             }
             div.wiki pre {
                 margin: 1em 1em 1em 1.6em;
                 padding: 2px;
                 background-color: #fafafa;
                 border: 1px solid #dadada;
                 width:95%;
                 overflow-x: auto;
             }
             div.wiki div.toc {
                 background-color: #ffffdd;
                 border: 1px solid #e4e4e4;
                 padding: 4px;
                 line-height: 1.2em;
                 margin-bottom: 12px;
                 margin-right: 12px;
                 display: table
             }
             * html div.wiki div.toc { width: 50%; } /* IE6 doesn't autosize div */
             div.wiki div.toc.right { float: right; margin-left: 12px; margin-right: 0; width: auto; }
             div.wiki div.toc.left  { float: left; margin-right: 12px; margin-left: 0; width: auto; }
             div.wiki div.toc a {
                 display: block;
                 font-size: 0.9em;
                 font-weight: normal;
                 text-decoration: none;
                 color: #606060;
             }
             div.wiki div.toc a:hover { color: #c61a1a; text-decoration: underline;}
             div.wiki div.toc a.heading2 { margin-left: 6px; }
             div.wiki div.toc a.heading3 { margin-left: 12px; font-size: 0.8em; }
             /***** My page layout *****/
             .block-receiver {
             border:1px dashed #c0c0c0;
             margin-bottom: 20px;
             padding: 15px 0 15px 0;
             }
             .mypage-box {
             margin:0 0 20px 0;
             color:#505050;
             line-height:1.5em;
             }
             .handle {
             cursor: move;
             }
             a.close-icon {
             display:block;
             margin-top:3px;
             overflow:hidden;
             width:12px;
             height:12px;
             background-repeat: no-repeat;
             cursor:pointer;
             background-image:url('../images/close.png');
             }
             a.close-icon:hover {
             background-image:url('../images/close_hl.png');
             }
             /***** Gantt chart *****/
             .gantt_hdr {
               position:absolute;
               top:0;
               height:16px;
               border-top: 1px solid #c0c0c0;
               border-bottom: 1px solid #c0c0c0;
               border-right: 1px solid #c0c0c0;
               text-align: center;
               overflow: hidden;
             }
             .task {
               position: absolute;
               height:8px;
               font-size:0.8em;
               color:#888;
               padding:0;
               margin:0;
               line-height:0.8em;
             }
             .task_late { background:#f66 url(../images/task_late.png); border: 1px solid #f66; }
             .task_done { background:#66f url(../images/task_done.png); border: 1px solid #66f; }
             .task_todo { background:#aaa url(../images/task_todo.png); border: 1px solid #aaa; }
             .milestone { background-image:url(../images/milestone.png); background-repeat: no-repeat; border: 0; }
             /***** Icons *****/
             .icon {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             padding-left: 20px;
             padding-top: 2px;
             padding-bottom: 3px;
             }
             .icon22 {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             padding-left: 26px;
             line-height: 22px;
             vertical-align: middle;
             }
             .icon-add { background-image: url(../images/add.png); }
             .icon-edit { background-image: url(../images/edit.png); }
             .icon-copy { background-image: url(../images/copy.png); }
             .icon-del { background-image: url(../images/delete.png); }
             .icon-move { background-image: url(../images/move.png); }
             .icon-save { background-image: url(../images/save.png); }
             .icon-cancel { background-image: url(../images/cancel.png); }
             .icon-file { background-image: url(../images/file.png); }
             .icon-folder { background-image: url(../images/folder.png); }
             .open .icon-folder { background-image: url(../images/folder_open.png); }
             .icon-package { background-image: url(../images/package.png); }
             .icon-home { background-image: url(../images/home.png); }
             .icon-user { background-image: url(../images/user.png); }
             .icon-mypage { background-image: url(../images/user_page.png); }
             .icon-admin { background-image: url(../images/admin.png); }
             .icon-projects { background-image: url(../images/projects.png); }
             .icon-logout { background-image: url(../images/logout.png); }
             .icon-help { background-image: url(../images/help.png); }
             .icon-attachment  { background-image: url(../images/attachment.png); }
             .icon-index  { background-image: url(../images/index.png); }
             .icon-history  { background-image: url(../images/history.png); }
             .icon-time  { background-image: url(../images/time.png); }
             .icon-stats  { background-image: url(../images/stats.png); }
             .icon-warning  { background-image: url(../images/warning.png); }
             .icon-fav  { background-image: url(../images/fav.png); }
             .icon-fav-off  { background-image: url(../images/fav_off.png); }
             .icon-reload  { background-image: url(../images/reload.png); }
             .icon-lock  { background-image: url(../images/locked.png); }
             .icon-unlock  { background-image: url(../images/unlock.png); }
             .icon-checked  { background-image: url(../images/true.png); }
             .icon-details  { background-image: url(../images/zoom_in.png); }
             .icon-report  { background-image: url(../images/report.png); }
             .icon22-projects { background-image: url(../images/22x22/projects.png); }
             .icon22-users { background-image: url(../images/22x22/users.png); }
             .icon22-tracker { background-image: url(../images/22x22/tracker.png); }
             .icon22-role { background-image: url(../images/22x22/role.png); }
             .icon22-workflow { background-image: url(../images/22x22/workflow.png); }
             .icon22-options { background-image: url(../images/22x22/options.png); }
             .icon22-notifications { background-image: url(../images/22x22/notifications.png); }
             .icon22-authent { background-image: url(../images/22x22/authent.png); }
             .icon22-info { background-image: url(../images/22x22/info.png); }
             .icon22-comment { background-image: url(../images/22x22/comment.png); }
             .icon22-package { background-image: url(../images/22x22/package.png); }
             .icon22-settings { background-image: url(../images/22x22/settings.png); }
             .icon22-plugin { background-image: url(../images/22x22/plugin.png); }
             /***** Media print specific styles *****/
             @media print {
               #top-menu, #header, #main-menu, #sidebar, #footer, .contextual, .other-formats { display:none; }
               #main { background: #fff; }
               #content { width: 99%; margin: 0; padding: 0; border: 0; background: #fff; }
             }

test/unit/helpers/application_helper_test.rb +8 0

             # redMine - project management software
             # Copyright (C) 2006-2007  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.
             require File.dirname(__FILE__) + '/../../test_helper'
             class ApplicationHelperTest < HelperTestCase
               include ApplicationHelper
               include ActionView::Helpers::TextHelper
               fixtures :projects, :repositories, :changesets, :trackers, :issue_statuses, :issues, :documents, :versions, :wikis, :wiki_pages, :wiki_contents, :roles, :enabled_modules
               def setup
                 super
               end
               def test_auto_links
                 to_test = {
                   'http://foo.bar' => '<a class="external" href="http://foo.bar">http://foo.bar</a>',
                   'http://foo.bar/~user' => '<a class="external" href="http://foo.bar/~user">http://foo.bar/~user</a>',
                   'http://foo.bar.' => '<a class="external" href="http://foo.bar">http://foo.bar</a>.',
                   'http://foo.bar/foo.bar#foo.bar.' => '<a class="external" href="http://foo.bar/foo.bar#foo.bar">http://foo.bar/foo.bar#foo.bar</a>.',
                   'www.foo.bar' => '<a class="external" href="http://www.foo.bar">www.foo.bar</a>',
                   'http://foo.bar/page?p=1&t=z&s=' => '<a class="external" href="http://foo.bar/page?p=1&#38;t=z&#38;s=">http://foo.bar/page?p=1&#38;t=z&#38;s=</a>',
                   'http://foo.bar/page#125' => '<a class="external" href="http://foo.bar/page#125">http://foo.bar/page#125</a>'
                 }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_auto_mailto
                 assert_equal '<p><a href="mailto:test@foo.bar" class="email">test@foo.bar</a></p>',
                   textilizable('test@foo.bar')
               end
               def test_inline_images
                 to_test = {
                   '!http://foo.bar/image.jpg!' => '<img src="http://foo.bar/image.jpg" alt="" />',
                   'floating !>http://foo.bar/image.jpg!' => 'floating <div style="float:right"><img src="http://foo.bar/image.jpg" alt="" /></div>',
                   'with class !(some-class)http://foo.bar/image.jpg!' => 'with class <img src="http://foo.bar/image.jpg" class="some-class" alt="" />',
                   'with style !{width:100px;height100px}http://foo.bar/image.jpg!' => 'with style <img src="http://foo.bar/image.jpg" style="width:100px;height100px;" alt="" />',
                 }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_textile_external_links
                 to_test = {
                   'This is a "link":http://foo.bar' => 'This is a <a href="http://foo.bar" class="external">link</a>',
                   'This is an intern "link":/foo/bar' => 'This is an intern <a href="/foo/bar">link</a>',
                   '"link (Link title)":http://foo.bar' => '<a href="http://foo.bar" title="Link title" class="external">link</a>',
                   # no multiline link text
                   "This is a double quote \"on the first line\nand another on a second line\":test" => "This is a double quote \"on the first line<br />\nand another on a second line\":test"
                 }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_redmine_links
                 issue_link = link_to('#3', {:controller => 'issues', :action => 'show', :id => 3},
                                            :class => 'issue', :title => 'Error 281 when updating a recipe (New)')
                 changeset_link = link_to('r1', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 1},
                                                :class => 'changeset', :title => 'My very first commit')
                 document_link = link_to('Test document', {:controller => 'documents', :action => 'show', :id => 1},
                                                          :class => 'document')
                 version_link = link_to('1.0', {:controller => 'versions', :action => 'show', :id => 2},
                                               :class => 'version')
                 source_url = {:controller => 'repositories', :action => 'entry', :id => 'ecookbook', :path => 'some/file'}
                 to_test = {
                   # tickets
                   '#3, #3 and #3.'              => "#{issue_link}, #{issue_link} and #{issue_link}.",
                   # changesets
                   'r1'                          => changeset_link,
                   # documents
                   'document#1'                  => document_link,
                   'document:"Test document"'    => document_link,
                   # versions
                   'version#2'                   => version_link,
                   'version:1.0'                 => version_link,
                   'version:"1.0"'               => version_link,
                   # source
                   'source:/some/file'           => link_to('source:/some/file', source_url, :class => 'source'),
                   'source:/some/file@52'        => link_to('source:/some/file@52', source_url.merge(:rev => 52), :class => 'source'),
                   'source:/some/file#L110'      => link_to('source:/some/file#L110', source_url.merge(:anchor => 'L110'), :class => 'source'),
                   'source:/some/file@52#L110'   => link_to('source:/some/file@52#L110', source_url.merge(:rev => 52, :anchor => 'L110'), :class => 'source'),
                   'export:/some/file'           => link_to('export:/some/file', source_url.merge(:format => 'raw'), :class => 'source download'),
                   # escaping
                   '!#3.'                        => '#3.',
                   '!r1'                         => 'r1',
                   '!document#1'                 => 'document#1',
                   '!document:"Test document"'   => 'document:"Test document"',
                   '!version#2'                  => 'version#2',
                   '!version:1.0'                => 'version:1.0',
                   '!version:"1.0"'              => 'version:"1.0"',
                   '!source:/some/file'          => 'source:/some/file',
                   # invalid expressions
                   'source:'                     => 'source:',
                   # url hash
                   "http://foo.bar/FAQ#3"       => '<a class="external" href="http://foo.bar/FAQ#3">http://foo.bar/FAQ#3</a>',
                 }
                 @project = Project.find(1)
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_wiki_links
                 to_test = {
                   '[[CookBook documentation]]' => '<a href="/wiki/ecookbook/CookBook_documentation" class="wiki-page">CookBook documentation</a>',
                   '[[Another page|Page]]' => '<a href="/wiki/ecookbook/Another_page" class="wiki-page">Page</a>',
                   # page that doesn't exist
                   '[[Unknown page]]' => '<a href="/wiki/ecookbook/Unknown_page" class="wiki-page new">Unknown page</a>',
                   '[[Unknown page|404]]' => '<a href="/wiki/ecookbook/Unknown_page" class="wiki-page new">404</a>',
                   # link to another project wiki
                   '[[onlinestore:]]' => '<a href="/wiki/onlinestore/" class="wiki-page">onlinestore</a>',
                   '[[onlinestore:|Wiki]]' => '<a href="/wiki/onlinestore/" class="wiki-page">Wiki</a>',
                   '[[onlinestore:Start page]]' => '<a href="/wiki/onlinestore/Start_page" class="wiki-page">Start page</a>',
                   '[[onlinestore:Start page|Text]]' => '<a href="/wiki/onlinestore/Start_page" class="wiki-page">Text</a>',
                   '[[onlinestore:Unknown page]]' => '<a href="/wiki/onlinestore/Unknown_page" class="wiki-page new">Unknown page</a>',
                   # escaping
                   '![[Another page|Page]]' => '[[Another page|Page]]',
                 }
                 @project = Project.find(1)
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_html_tags
                 to_test = {
                   "<div>content</div>" => "<p>&lt;div&gt;content&lt;/div&gt;</p>",
                   "<div class=\"bold\">content</div>" => "<p>&lt;div class=\"bold\"&gt;content&lt;/div&gt;</p>",
                   "<script>some script;</script>" => "<p>&lt;script&gt;some script;&lt;/script&gt;</p>",
                   # do not escape pre/code tags
                   "<pre>\nline 1\nline2</pre>" => "<pre>\nline 1\nline2</pre>",
                   "<pre><code>\nline 1\nline2</code></pre>" => "<pre><code>\nline 1\nline2</code></pre>",
                   "<pre><div>content</div></pre>" => "<pre>&lt;div&gt;content&lt;/div&gt;</pre>",
                   "HTML comment: <!-- no comments -->" => "<p>HTML comment: &lt;!-- no comments --&gt;</p>",
                   "<!-- opening comment" => "<p>&lt;!-- opening comment</p>"
                 }
                 to_test.each { |text, result| assert_equal result, textilizable(text) }
               end
+              def test_allowed_html_tags
+                to_test = {
+                  "<pre>preformatted text</pre>" => "<pre>preformatted text</pre>",
+                  "<notextile>no *textile* formatting</notextile>" => "no *textile* formatting",
+                }
+                to_test.each { |text, result| assert_equal result, textilizable(text) }
+              end
               def test_wiki_links_in_tables
                 to_test = {"|Cell 11|Cell 12|Cell 13|\n|Cell 21|Cell 22||\n|Cell 31||Cell 33|" =>
                              '<tr><td>Cell 11</td><td>Cell 12</td><td>Cell 13</td></tr>' +
                              '<tr><td>Cell 21</td><td>Cell 22</td></tr>' +
                              '<tr><td>Cell 31</td><td>Cell 33</td></tr>',
                            "|[[Page|Link title]]|[[Other Page|Other title]]|\n|Cell 21|[[Last page]]|" =>
                              '<tr><td><a href="/wiki/ecookbook/Page" class="wiki-page new">Link title</a></td>' +
                              '<td><a href="/wiki/ecookbook/Other_Page" class="wiki-page new">Other title</a></td>' +
                              '</tr><tr><td>Cell 21</td><td><a href="/wiki/ecookbook/Last_page" class="wiki-page new">Last page</a></td></tr>'
                 }
                 @project = Project.find(1)
                 to_test.each { |text, result| assert_equal "<table>#{result}</table>", textilizable(text).gsub(/[\t\n]/, '') }
               end
               def test_text_formatting
                 to_test = {'*_+bold, italic and underline+_*' => '<strong><em><ins>bold, italic and underline</ins></em></strong>',
                            '(_text within parentheses_)' => '(<em>text within parentheses</em>)'
                           }
                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
               end
               def test_wiki_horizontal_rule
                 assert_equal '<hr />', textilizable('---')
                 assert_equal '<p>Dashes: ---</p>', textilizable('Dashes: ---')
               end
               def test_macro_hello_world
                 text = "{{hello_world}}"
                 assert textilizable(text).match(/Hello world!/)
                 # escaping
                 text = "!{{hello_world}}"
                 assert_equal '<p>{{hello_world}}</p>', textilizable(text)
               end
               def test_macro_include
                 @project = Project.find(1)
                 # include a page of the current project wiki
                 text = "{{include(Another page)}}"
                 assert textilizable(text).match(/This is a link to a ticket/)
                 @project = nil
                 # include a page of a specific project wiki
                 text = "{{include(ecookbook:Another page)}}"
                 assert textilizable(text).match(/This is a link to a ticket/)
                 text = "{{include(ecookbook:)}}"
                 assert textilizable(text).match(/CookBook documentation/)
                 text = "{{include(unknowidentifier:somepage)}}"
                 assert textilizable(text).match(/Unknow project/)
               end
               def test_date_format_default
                 today = Date.today
                 Setting.date_format = ''
                 assert_equal l_date(today), format_date(today)
               end
               def test_date_format
                 today = Date.today
                 Setting.date_format = '%d %m %Y'
                 assert_equal today.strftime('%d %m %Y'), format_date(today)
               end
               def test_time_format_default
                 now = Time.now
                 Setting.date_format = ''
                 Setting.time_format = ''
                 assert_equal l_datetime(now), format_time(now)
                 assert_equal l_time(now), format_time(now, false)
               end
               def test_time_format
                 now = Time.now
                 Setting.date_format = '%d %m %Y'
                 Setting.time_format = '%H %M'
                 assert_equal now.strftime('%d %m %Y %H %M'), format_time(now)
                 assert_equal now.strftime('%H %M'), format_time(now, false)
               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