Revision 1297:0a574315af3e lib/redmine/wiki_formatting

View differences:

lib/redmine/wiki_formatting/macros.rb
147 147 
          unless block_given?
148 148 
            raise "Can not create a macro without a block!"
149 149 
          end
150 
          name = name.to_sym if name.is_a?(String)
150 
          name = name.to_s.downcase.to_sym
151 151 
          available_macros[name] = {:desc => @@desc || ''}.merge(options)
152 152 
          @@desc = nil
153 
          Definitions.send :define_method, "macro_#{name}".downcase, &block
153 
          Definitions.send :define_method, "macro_#{name}", &block
154 154 
        end
155 155 

  		




  156
  156
  
    
        # Sets description for the next macro to be defined


  		












  

    
      lib/redmine/wiki_formatting/textile/formatter.rb
    
  





  69
  69
  
    
          l = 1


  		




  70
  70
  
    
          started = false


  		




  71
  71
  
    
          ended = false


  		




  72
  
  
    
          text.scan(/(((?:.*?)(\A|\r?\n\s*\r?\n))(h(\d+)(#{A}#{C})\.(?::(\S+))? (.*?)$)|.*)/m).each do |all, content, lf, heading, level|


  		




  
  72
  
    
          text.scan(/(((?:.*?)(\A|\r?\n\s*\r?\n))(h(\d+)(#{A}#{C})\.(?::(\S+))?[ \t](.*?)$)|.*)/m).each do |all, content, lf, heading, level|


  		




  73
  73
  
    
            if heading.nil?


  		




  74
  74
  
    
              if ended


  		




  75
  75
  
    
                after << all


  		












Also available in:  Unified diff